Clear initfini list after freeing. Fixes bug 15308.

diff --git a/ChangeLog b/ChangeLog
index 579ac6f1025e8f903a5f571d7d90a64a6fd1b401..5724413bf56163ace4eb3ca498bba6d0adb46ab1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-15   Ondřej Bílka  <neleai@seznam.cz>
+
+       * elf/dl-libc.c: Clear initfini list after freeing.
+
 2013-10-14  Joseph Myers  <joseph@codesourcery.com>
 
        * soft-fp/adddf3.c: Fix vertical whitespace and indentation.

diff --git a/NEWS b/NEWS
index 48bbb02285e698259e578a91ad4650a1876aaa6c..ac375f8045ec0e2a52da5e59be82049809192404 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,12 +10,13 @@ Version 2.19
 * The following bugs are resolved with this release:
 
   156, 431, 832, 13028, 13982, 13985, 14155, 14547, 14699, 14910, 15048,
-  15362, 15400, 15427, 15522, 15531, 15532, 15608, 15609, 15610, 15632,
-  15640, 15672, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749,
-  15754, 15760, 15764, 15797, 15844, 15847, 15849, 15855, 15856, 15857,
-  15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905,
-  15909, 15919, 15921, 15923, 15939, 15963, 15966, 15988, 16032, 16034,
-  16036.
+  15308, 15362, 15400, 15427, 15522, 15531, 15532, 15608, 15609, 15610,
+  15632, 15640, 15672, 15680, 15681, 15723, 15734, 15735, 15736, 15748,
+  15749, 15754, 15760, 15764, 15797, 15844, 15847, 15849, 15855, 15856,
+  15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897,
+  15905, 15909, 15919, 15921, 15923, 15939, 15963, 15966, 15988, 16032,
+  15905, 15909, 15919, 15921, 15923, 15939, 15963, 15966, 15988, 16032,
+  16034, 16036.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index aba0d1af199ba5d32d009033494311b5e9daac2e..397d8989937da35fdf654ed2d19a535850fc8a82 100644 (file)
--- a/elf/dl-libc.c
+++ b/elf/dl-libc.c
@@ -286,6 +286,7 @@ libc_freeres_fn (free_mem)
          /* Free the initfini dependency list.  */
          if (l->l_free_initfini)
            free (l->l_initfini);
+         l->l_initfini = NULL;
        }
 
       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0