From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 11 Oct 2004 07:16:47 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20041012T1128~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=173a06ecd898439de75f25cee5c5776c4181661d;p=thirdparty%2Fglibc.git

Update.

2004-10-11  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-sym.c (do_sym): Avoid using global variable.

	* elf/dl-addr.c (_dl_addr): Really use match everywhere.
---

diff --git a/ChangeLog b/ChangeLog
index 017d286d606..c8e1c70301b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/dl-sym.c (do_sym): Avoid using global variable.
+
+	* elf/dl-addr.c (_dl_addr): Really use match everywhere.
+
 2004-10-09  Andreas Schwab  <schwab@suse.de>
 
 	* sysdeps/m68k/memcopy.h (WORD_COPY_BWD): Remove use of cast as
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index c7c737804ec..a94610263de 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -90,9 +90,9 @@ do_sym (void *handle, const char *name, void *who,
     {
       if (__builtin_expect (match == GL(dl_loaded), 0))
 	{
-	  if (! GL(dl_loaded)
-	      || caller < GL(dl_loaded)->l_map_start
-	      || caller >= GL(dl_loaded)->l_map_end)
+	  if (match == NULL
+	      || caller < match->l_map_start
+	      || caller >= match->l_map_end)
 	    GLRO(dl_signal_error) (0, NULL, NULL, N_("\
 RTLD_NEXT used in code not dynamically loaded"));
 	}