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

am 8a6217df: am 3d2bc5d6: Merge "HACK: linker: check for handle==0xffffffff on LP64"

Browse Source 
* commit '8a6217df921eadf7e2f92fb82f2e6f1bfe36d5cb':
  HACK: linker: check for handle==0xffffffff on LP64
This commit is contained in:
Colin Cross 2014-05-20 23:45:48 +00:00 committed by Android Git Automerger
commit 5788984925
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker/dlfcn.cpp
View File

@ -102,7 +102,7 @@ void* dlsym(void* handle, const char* symbol) {
ElfW(Sym)* sym = NULL; ElfW(Sym)* sym = NULL;
if (handle == RTLD_DEFAULT) { if (handle == RTLD_DEFAULT) {
sym = dlsym_linear_lookup(symbol, &found, NULL); sym = dlsym_linear_lookup(symbol, &found, NULL);
} else if (handle == RTLD_NEXT) { } else if (handle == RTLD_NEXT || handle == (void*)0xffffffffL) {
void* caller_addr = __builtin_return_address(0); void* caller_addr = __builtin_return_address(0);
soinfo* si = find_containing_library(caller_addr); soinfo* si = find_containing_library(caller_addr);