[Commits] r24069 - in /fsf/trunk/libc: ChangeLog NEWS elf/dl-deps.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Sep 22 00:01:58 2013
New Revision: 24069

Log:
Import glibc-mainline for 2013-09-22

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/elf/dl-deps.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Sep 22 00:01:58 2013
@@ -1,3 +1,8 @@
+2013-09-15  Vinitha Vijayan <vinitha.vijayann@xxxxxxxxx>
+
+	[BZ #15859]
+	* elf/dl-deps.c (_dl_map_object_deps): Remove duplicate declaration.
+
 2013-09-20  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* include/string.h (__ffs): Declare as hidden.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sun Sep 22 00:01:58 2013
@@ -9,10 +9,11 @@
 
 * The following bugs are resolved with this release:
 
-  13985. 14155, 14699, 15427, 15522, 15531, 15532, 15640, 15736, 15748,
-  15749, 15797, 15844, 15849, 15855, 15856, 15857, 15867, 15886, 15887,
-  15890, 15892, 15893, 15895, 15897, 15905, 15909, 15921, 15939, 15966,
-  15963.
+  13985, 14155, 14699, 15427, 15522, 15531, 15532, 15640, 15736, 15748,
+  15749, 15797, 15844, 15849, 15855, 15856, 15857, 15859, 15867, 15886,
+  15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15921, 15939,
+  15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15921, 15939,
+  15963, 15966.
 
 * CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
   to the d_name member of struct dirent, or omit the terminating NUL

Modified: fsf/trunk/libc/elf/dl-deps.c
==============================================================================
--- fsf/trunk/libc/elf/dl-deps.c (original)
+++ fsf/trunk/libc/elf/dl-deps.c Sun Sep 22 00:01:58 2013
@@ -595,7 +595,6 @@
 	if (list[i]->l_reserved)
 	  {
 	    /* Need to allocate new array of relocation dependencies.  */
-	    struct link_map_reldeps *l_reldeps;
 	    l_reldeps = malloc (sizeof (*l_reldeps)
 				+ map->l_reldepsmax
 				  * sizeof (struct link_map *));

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