diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-04-21 12:07:52 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-04-21 12:07:52 -0400 |
| commit | e84142d2a9eed278ecf869459a5de0b640074517 (patch) | |
| tree | e2e8596951350928fb3b3cac9b897810fe3ab4e3 | |
| parent | 877175d8ea2e0182909e04cac603017ca31022ef (diff) | |
| download | glibc-e84142d2a9eed278ecf869459a5de0b640074517.tar.gz glibc-e84142d2a9eed278ecf869459a5de0b640074517.tar.xz glibc-e84142d2a9eed278ecf869459a5de0b640074517.zip | |
Fix reallocation bug in last nss_files change.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nss/nss_files/files-initgroups.c | 3 |
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; |