[Commits] r15734 - in /fsf/trunk/libc: ChangeLog libio/genops.c nss/nss_files/files-initgroups.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Nov  8 00:03:38 2011
New Revision: 15734

Log:
Import glibc-mainline for 2011-11-08

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

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Nov  8 00:03:38 2011
@@ -1,3 +1,11 @@
+2011-11-07  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* libio/genops.c (_IO_flush_all_lockp): Only register cleanup
+	handler when locking.
+
+	* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn):
+	Fix size of allocated buffer.
+
 2011-11-04  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	[BZ #10103]

Modified: fsf/trunk/libc/libio/genops.c
==============================================================================
--- fsf/trunk/libc/libio/genops.c (original)
+++ fsf/trunk/libc/libio/genops.c Tue Nov  8 00:03:38 2011
@@ -826,7 +826,7 @@
   int last_stamp;
 
 #ifdef _IO_MTSAFE_IO
-  _IO_cleanup_region_start_noarg (flush_cleanup);
+  __libc_cleanup_region_start (do_lock, flush_cleanup, 0);
   if (do_lock)
     _IO_lock_lock (list_all_lock);
 #endif
@@ -866,7 +866,7 @@
 #ifdef _IO_MTSAFE_IO
   if (do_lock)
     _IO_lock_unlock (list_all_lock);
-  _IO_cleanup_region_end (0);
+  __libc_cleanup_region_end (0);
 #endif
 
   return result;

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 Tue Nov  8 00:03:38 2011
@@ -73,7 +73,7 @@
 	  if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen))
 	    {
 	      void *newbuf = realloc (buffer_use_malloc ? buffer : NULL,
-				      buflen);
+				      newbuflen);
 	      if (newbuf == NULL)
 		{
 		  *errnop = ENOMEM;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits