diff options
Diffstat (limited to 'elf/dl-addr.c')
| -rw-r--r-- | elf/dl-addr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/elf/dl-addr.c b/elf/dl-addr.c index b0b864fa57..3932a6573a 100644 --- a/elf/dl-addr.c +++ b/elf/dl-addr.c @@ -34,12 +34,13 @@ _dl_addr (const void *address, Dl_info *info) /* Find the highest-addressed object that ADDRESS is not below. */ match = NULL; for (l = _dl_loaded; l; l = l->l_next) - if (l->l_addr != 0 /* Make sure we do not currently set this map up - in this moment. */ - && addr >= l->l_addr && (!match || match->l_addr < l->l_addr)) - match = l; + if (addr >= l->l_map_start && addr < l->l_map_end) + { + match = l; + break; + } - if (match) + if (__builtin_expect (match != NULL, 1)) { /* We know ADDRESS lies within MATCH if in any shared object. Make sure it isn't past the end of MATCH's segments. */ |