[BZ #15859] Fix memory leak in _dl_map_object_deps

diff --git a/ChangeLog b/ChangeLog
index a7791b2f0b186abdc0d5c3a7d4b64fa77e2c2ad4..4282494032682629e0ef0b2102076f26e70ee2ef 100644 (file)
--- 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 0137240790b2dcb80db07ff4ff39ac2eb64a297d..7867c5720142a01f41e6d66a114eca0bba8145ac 100644 (file)
--- 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 1c36f501bcad101e4aa5cd7287ad62552b1d6cbf..6652f6d0cd82b64f79f9440044fe9f8c81443d9f 100644 (file)
--- 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 *));