r4965 - in glibc-package/branches/glibc-branch-squeeze/debian: . patches patches/any
Author: aurel32
Date: 2011-09-12 05:10:44 +0000 (Mon, 12 Sep 2011)
New Revision: 4965
Added:
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-dl_close-scope-handling.diff
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/changelog
glibc-package/branches/glibc-branch-squeeze/debian/patches/series
Log:
* Add debian/patches/cvs-dl_close-scope-handling.diff from upstream to
fix issues with dl_close() when resolving locally-defined symbols.
Closes: #625250.
Modified: glibc-package/branches/glibc-branch-squeeze/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/changelog 2011-09-12 05:01:28 UTC (rev 4964)
+++ glibc-package/branches/glibc-branch-squeeze/debian/changelog 2011-09-12 05:10:44 UTC (rev 4965)
@@ -42,6 +42,9 @@
single lookup dns requests. Closes: #541167.
* Add patches/any/cvs-pthread-setgroups.diff to fix setgroups() with
multiple threads.
+ * Add debian/patches/cvs-dl_close-scope-handling.diff from upstream to
+ fix issues with dl_close() when resolving locally-defined symbols.
+ Closes: #625250.
-- Aurelien Jarno <aurel32@debian.org> Sat, 11 Jun 2011 18:12:35 +0200
Added: glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-dl_close-scope-handling.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-dl_close-scope-handling.diff (rev 0)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-dl_close-scope-handling.diff 2011-09-12 05:10:44 UTC (rev 4965)
@@ -0,0 +1,23 @@
+2011-08-24 Andreas Schwab <schwab@redhat.com>
+
+ * elf/dl-close.c (_dl_close_worker): Reset private search list if
+ it wasn't used.
+
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 4cf98c3..8fb55d0 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -430,6 +430,13 @@ _dl_close_worker (struct link_map *map)
+
+ imap->l_scope_max = new_size;
+ }
++ else if (new_list != NULL)
++ {
++ /* We didn't change the scope array, so reset the search
++ list. */
++ imap->l_searchlist.r_list = NULL;
++ imap->l_searchlist.r_nlist = 0;
++ }
+
+ /* The loader is gone, so mark the object as not having one.
+ Note: l_idx != IDX_STILL_USED -> object will be removed. */
Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/series 2011-09-12 05:01:28 UTC (rev 4964)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/series 2011-09-12 05:10:44 UTC (rev 4965)
@@ -264,3 +264,4 @@
any/submitted-resolv-assert.diff
any/cvs-getaddrinfo-single-lookup.diff
any/cvs-pthread-setgroups.diff
+any/cvs-dl_close-scope-handling.diff
Reply to: