* hurd/fd-read.c (_hurd_fd_read): Fix last change.
authorRoland McGrath <roland@gnu.org>
Tue, 22 Jul 2008 20:21:19 +0000 (20:21 +0000)
committerRoland McGrath <roland@gnu.org>
Tue, 22 Jul 2008 20:21:19 +0000 (20:21 +0000)
ChangeLog
hurd/fd-read.c

index 88343cf661f4238685fd060f80d59245e037245f..daccb37cd53f67318314818f922bd10dcaa0e024 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-22  Roland McGrath  <roland@frob.com>
+
+       * hurd/fd-read.c (_hurd_fd_read): Fix last change.
+
 2008-07-21  Roland McGrath  <roland@frob.com>
 
        * hurd/fd-read.c (_hurd_fd_read): Return EGRATUITOUS if the server
index d673c78e03f64c9d32b2ca4a67e703b49dec0c5d..38706524f0c4dee1abb864cd512945cda1da1c02 100644 (file)
@@ -42,7 +42,10 @@ _hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, loff_t offset)
   if (data != buf)
     {
       if (nread > *nbytes)     /* Sanity check for bogus server.  */
-       return EGRATUITOUS;
+       {
+         __vm_deallocate (__mach_task_self (), (vm_address_t) data, nread);
+         return EGRATUITOUS;
+       }
       memcpy (buf, data, nread);
       __vm_deallocate (__mach_task_self (), (vm_address_t) data, nread);
     }