summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
Diffstat (limited to 'ldso')
-rw-r--r--ldso/dynlink.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index 31c50609..d963aeab 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -1951,6 +1951,7 @@ int dladdr(const void *addr_arg, Dl_info *info)
uint32_t nsym;
char *strings;
size_t best = 0;
+ size_t besterr = -1;
pthread_rwlock_rdlock(&lock);
p = addr2dso(addr);
@@ -1968,6 +1969,7 @@ int dladdr(const void *addr_arg, Dl_info *info)
if (idx < nsym && (sym[idx].st_info&0xf) == STT_FUNC) {
best = (size_t)(p->funcdescs + idx);
bestsym = sym + idx;
+ besterr = 0;
}
}
@@ -1978,18 +1980,19 @@ int dladdr(const void *addr_arg, Dl_info *info)
size_t symaddr = (size_t)laddr(p, sym->st_value);
if (symaddr > addr || symaddr < best)
continue;
- if (sym->st_size && symaddr+sym->st_size <= addr) {
- best = 0;
- bestsym = 0;
- continue;
- }
best = symaddr;
bestsym = sym;
+ besterr = addr - symaddr;
if (addr == symaddr)
break;
}
}
+ if (bestsym && besterr > bestsym->st_size-1) {
+ best = 0;
+ bestsym = 0;
+ }
+
info->dli_fname = p->name;
info->dli_fbase = p->map;