aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nss/nss_files/files-initgroups.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 934a23cb3f..0c8282e168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-21 Ulrich Drepper <drepper@gmail.com>
+
+ * nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Fix
+ problem in reallocation in last patch.
+
2011-04-20 Ulrich Drepper <drepper@gmail.com>
* sunrpc/Makefile: Move inclusion of Rules.
diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c
index 1c288e5ae3..4c7b9f8e6f 100644
--- a/nss/nss_files/files-initgroups.c
+++ b/nss/nss_files/files-initgroups.c
@@ -70,7 +70,8 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
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;