summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--elf/dl-sym.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 017d286d60..c8e1c70301 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 c7c737804e..a94610263d 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"));
}