about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVinitha Vijayan <vinitha.vijayann@gmail.com>2013-09-21 17:51:58 +0200
committerOndřej Bílka <neleai@seznam.cz>2013-09-21 19:18:23 +0200
commitf5f4e7b48bcc926e00913aa2ae6da19096864535 (patch)
treea2c4e48cbae7275968f22f80233584727a870445
parent5bb43a43199e2bc3f729b858d26c47e91fd56621 (diff)
downloadglibc-f5f4e7b48bcc926e00913aa2ae6da19096864535.tar.gz
glibc-f5f4e7b48bcc926e00913aa2ae6da19096864535.tar.xz
glibc-f5f4e7b48bcc926e00913aa2ae6da19096864535.zip
[BZ #15859] Fix memory leak in _dl_map_object_deps
-rw-r--r--ChangeLog5
-rw-r--r--NEWS9
-rw-r--r--elf/dl-deps.c1
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a7791b2f0b..4282494032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-15  Vinitha Vijayan <vinitha.vijayann@gmail.com>
+
+	[BZ #15859]
+	* elf/dl-deps.c (_dl_map_object_deps): Remove duplicate declaration.
+
 2013-09-20  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* include/string.h (__ffs): Declare as hidden.
diff --git a/NEWS b/NEWS
index 0137240790..7867c57201 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,11 @@ Version 2.19
 
 * 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
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 1c36f501bc..6652f6d0cd 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -595,7 +595,6 @@ Filters not supported with LD_TRACE_PRELINKING"));
 	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 *));