[commits] r13557 - in /fsf/trunk/libc: ChangeLog nss/nss_files/files-initgroups.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Apr 22 00:03:28 2011
New Revision: 13557

Log:
Import glibc-mainline for 2011-04-22

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nss/nss_files/files-initgroups.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Apr 22 00:03:28 2011
@@ -1,3 +1,8 @@
+2011-04-21  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Fix
+	problem in reallocation in last patch.
+
 2011-04-20  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* sunrpc/Makefile: Move inclusion of Rules.

Modified: fsf/trunk/libc/nss/nss_files/files-initgroups.c
==============================================================================
--- fsf/trunk/libc/nss/nss_files/files-initgroups.c (original)
+++ fsf/trunk/libc/nss/nss_files/files-initgroups.c Fri Apr 22 00:03:28 2011
@@ -70,7 +70,8 @@
 	  size_t newbuflen = 2 * buflen;
 	  if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen))
 	    {
-	      char *newbuf = realloc (buffer, buflen);
+	      void *newbuf = realloc (buffer_use_malloc ? buffer : NULL,
+				      buflen);
 	      if (newbuf == NULL)
 		{
 		  *errnop = ENOMEM;