[commits] r6608 - in /fsf/trunk/libc: ChangeLog hurd/fd-read.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jul 23 00:04:24 2008
New Revision: 6608

Log:
Import glibc-mainline for 2008-07-23

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/hurd/fd-read.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jul 23 00:04:24 2008
@@ -1,3 +1,7 @@
+2008-07-22  Roland McGrath  <roland@xxxxxxxx>
+
+	* hurd/fd-read.c (_hurd_fd_read): Fix last change.
+
 2008-07-21  Roland McGrath  <roland@xxxxxxxx>
 
 	* hurd/fd-read.c (_hurd_fd_read): Return EGRATUITOUS if the server

Modified: fsf/trunk/libc/hurd/fd-read.c
==============================================================================
--- fsf/trunk/libc/hurd/fd-read.c (original)
+++ fsf/trunk/libc/hurd/fd-read.c Wed Jul 23 00:04:24 2008
@@ -42,7 +42,10 @@
   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);
     }