From e84142d2a9eed278ecf869459a5de0b640074517 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 21 Apr 2011 12:07:52 -0400 Subject: [PATCH] Fix reallocation bug in last nss_files change. --- ChangeLog | 5 +++++ nss/nss_files/files-initgroups.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 934a23c..0c8282e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-04-21 Ulrich Drepper + + * nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Fix + problem in reallocation in last patch. + 2011-04-20 Ulrich Drepper * sunrpc/Makefile: Move inclusion of Rules. diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c index 1c288e5..4c7b9f8 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; -- 2.7.4