[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4964 - in glibc-package/trunk/debian: . patches patches/any



Author: aurel32
Date: 2011-09-12 05:01:28 +0000 (Mon, 12 Sep 2011)
New Revision: 4964

Added:
   glibc-package/trunk/debian/patches/any/cvs-dl_close-scope-handling.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/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/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2011-09-11 10:32:42 UTC (rev 4963)
+++ glibc-package/trunk/debian/changelog	2011-09-12 05:01:28 UTC (rev 4964)
@@ -8,8 +8,13 @@
   * Add patches/hurd-i386/cvs-fork_ports.diff to fix uninitialized reference
     count.
 
- -- Samuel Thibault <sthibault@debian.org>  Thu, 08 Sep 2011 15:31:05 +0200
+  [ Aurelien Jarno ]
+  * 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>  Mon, 12 Sep 2011 07:01:20 +0200
+
 eglibc (2.13-20) unstable; urgency=low
 
   * debian/debhelper.in/libc.preinst: call /bin/mv with --version so 

Added: glibc-package/trunk/debian/patches/any/cvs-dl_close-scope-handling.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-dl_close-scope-handling.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-dl_close-scope-handling.diff	2011-09-12 05:01:28 UTC (rev 4964)
@@ -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/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2011-09-11 10:32:42 UTC (rev 4963)
+++ glibc-package/trunk/debian/patches/series	2011-09-12 05:01:28 UTC (rev 4964)
@@ -288,3 +288,4 @@
 powerpc/submitted-ifunc.diff
 any/cvs-dlopen-tls.diff
 any/submitted-glob_h-ifdef.diff
+any/cvs-dl_close-scope-handling.diff


Reply to: