generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: I518bb4ae9d7269957365561d4d609f22cde519db
This commit is contained in:
The Android Open Source Project 2010-04-21 09:10:08 -07:00
commit 5ef5272be9
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linker/dlfcn.c
View File

@ -91,9 +91,15 @@ void *dlsym(void *handle, const char *symbol)
} }
if(handle == RTLD_DEFAULT) { if(handle == RTLD_DEFAULT) {
sym = lookup(symbol, &found); sym = lookup(symbol, &found, NULL);
} else if(handle == RTLD_NEXT) { } else if(handle == RTLD_NEXT) {
sym = lookup(symbol, &found); void *ret_addr = __builtin_return_address(0);
soinfo *si = find_containing_library(ret_addr);
sym = NULL;
if(si && si->next) {
sym = lookup(symbol, &found, si->next);
}
} else { } else {
found = (soinfo*)handle; found = (soinfo*)handle;
sym = lookup_in_library(found, symbol); sym = lookup_in_library(found, symbol);

8
linker/linker.c
View File

@ -509,13 +509,17 @@ Elf32_Sym *lookup_in_library(soinfo *si, const char *name)
/* This is used by dl_sym(). It performs a global symbol lookup. /* This is used by dl_sym(). It performs a global symbol lookup.
*/ */
Elf32_Sym *lookup(const char *name, soinfo **found) Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start)
{ {
unsigned elf_hash = elfhash(name); unsigned elf_hash = elfhash(name);
Elf32_Sym *s = NULL; Elf32_Sym *s = NULL;
soinfo *si; soinfo *si;
for(si = solist; (s == NULL) && (si != NULL); si = si->next) if(start == NULL) {
start = solist;
}
for(si = start; (s == NULL) && (si != NULL); si = si->next)
{ {
if(si->flags & FLAG_ERROR) if(si->flags & FLAG_ERROR)
continue; continue;

2
linker/linker.h
View File

@ -224,7 +224,7 @@ extern soinfo libdl_info;
soinfo *find_library(const char *name); soinfo *find_library(const char *name);
unsigned unload_library(soinfo *si); unsigned unload_library(soinfo *si);
Elf32_Sym *lookup_in_library(soinfo *si, const char *name); Elf32_Sym *lookup_in_library(soinfo *si, const char *name);
Elf32_Sym *lookup(const char *name, soinfo **found); Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start);
soinfo *find_containing_library(void *addr); soinfo *find_containing_library(void *addr);
Elf32_Sym *find_containing_symbol(void *addr, soinfo *si); Elf32_Sym *find_containing_symbol(void *addr, soinfo *si);
const char *linker_get_error(void); const char *linker_get_error(void);