summaryrefslogtreecommitdiff
path: root/dlfcn
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-07-12 17:08:40 +0000
committerJakub Jelinek <jakub@redhat.com>2007-07-12 17:08:40 +0000
commita6778488dba0313ea73a4f871f2ae8e5223517e0 (patch)
tree7333b44eb84e11f7271ebe4c34e94feedea0710c /dlfcn
parent8b6256b34923f0ad719179285676e84143eeb2c8 (diff)
Updated to fedora-glibc-2_5-20070712T1701
Diffstat (limited to 'dlfcn')
-rw-r--r--dlfcn/dlinfo.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index b1e2b009a5..20aa9504fb 100644
--- a/dlfcn/dlinfo.c
+++ b/dlfcn/dlinfo.c
@@ -1,5 +1,5 @@
/* dlinfo -- Get information from the dynamic linker.
- Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -58,9 +58,8 @@ dlinfo_doit (void *argsblock)
/* Find the highest-addressed object that CALLER is not below. */
for (nsid = 0; nsid < DL_NNS; ++nsid)
for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next)
- if (caller >= l->l_map_start && caller < l->l_map_end)
- /* There must be exactly one DSO for the range of the virtual
- memory. Otherwise something is really broken. */
+ if (caller >= l->l_map_start && caller < l->l_map_end
+ && (l->l_contiguous || _dl_addr_inside_object (l, caller)))
break;
if (l == NULL)