From 9ea64da6c511e8f9f4edae4c10c20879957631ab Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Mon, 28 Sep 2009 18:21:30 -0700 Subject: bionic/linker: change lookup() to return soinfo, not base --- linker/dlfcn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'linker/dlfcn.c') diff --git a/linker/dlfcn.c b/linker/dlfcn.c index b54674f..053713c 100644 --- a/linker/dlfcn.c +++ b/linker/dlfcn.c @@ -74,7 +74,7 @@ const char *dlerror(void) void *dlsym(void *handle, const char *symbol) { - unsigned base; + soinfo *found; Elf32_Sym *sym; unsigned bind; @@ -90,19 +90,19 @@ void *dlsym(void *handle, const char *symbol) } if(handle == RTLD_DEFAULT) { - sym = lookup(symbol, &base); + sym = lookup(symbol, &found); } else if(handle == RTLD_NEXT) { - sym = lookup(symbol, &base); + sym = lookup(symbol, &found); } else { - sym = lookup_in_library((soinfo*) handle, symbol); - base = ((soinfo*) handle)->base; + found = (soinfo*)handle; + sym = lookup_in_library(found, symbol); } if(likely(sym != 0)) { bind = ELF32_ST_BIND(sym->st_info); if(likely((bind == STB_GLOBAL) && (sym->st_shndx != 0))) { - unsigned ret = sym->st_value + base; + unsigned ret = sym->st_value + found->base; pthread_mutex_unlock(&dl_lock); return (void*)ret; } -- cgit v1.1