This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.13-93-ge84142d


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  e84142d2a9eed278ecf869459a5de0b640074517 (commit)
      from  877175d8ea2e0182909e04cac603017ca31022ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e84142d2a9eed278ecf869459a5de0b640074517

commit e84142d2a9eed278ecf869459a5de0b640074517
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Thu Apr 21 12:07:52 2011 -0400

    Fix reallocation bug in last nss_files change.

diff --git a/ChangeLog b/ChangeLog
index 934a23c..0c8282e 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 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;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    5 +++++
 nss/nss_files/files-initgroups.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]