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

am 5bfa06de: am 3eb9f1f6: Merge "Removed dlsym handle != NULL check for lp64"

Browse Source 
* commit '5bfa06de888770970d56d598960ba7c375998c75':
  Removed dlsym handle != NULL check for lp64
This commit is contained in:
Dmitriy Ivanov 2014-05-22 13:03:27 +00:00 committed by Android Git Automerger
commit 1ca1db1204
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linker/dlfcn.cpp
View File

@ -89,10 +89,13 @@ void* dlopen(const char* filename, int flags) {
void* dlsym(void* handle, const char* symbol) {
ScopedPthreadMutexLocker locker(&g_dl_mutex);
#if !defined(__LP64__)
if (handle == NULL) {
__bionic_format_dlerror("dlsym library handle is null", NULL);
return NULL;
}
#endif
if (symbol == NULL) {
__bionic_format_dlerror("dlsym symbol name is null", NULL);
return NULL;
@ -100,9 +103,9 @@ void* dlsym(void* handle, const char* symbol) {
soinfo* found = NULL;
ElfW(Sym)* sym = NULL;
if (handle == RTLD_DEFAULT) {
if (handle == RTLD_DEFAULT || handle == (void*)0xffffffffL) {
sym = dlsym_linear_lookup(symbol, &found, NULL);
} else if (handle == RTLD_NEXT || handle == (void*)0xffffffffL) {
} else if (handle == RTLD_NEXT || handle == (void*)0xfffffffeL) {
void* caller_addr = __builtin_return_address(0);
soinfo* si = find_containing_library(caller_addr);

3
tests/dlfcn_test.cpp
View File

@ -101,6 +101,8 @@ TEST(dlfcn, dlsym_failures) {
void* sym;
// lp64 RTLD_DEFAULT=(void*)0
#if !defined(__LP64__)
// NULL handle.
sym = dlsym(NULL, "test");
ASSERT_TRUE(sym == NULL);
@ -109,6 +111,7 @@ TEST(dlfcn, dlsym_failures) {
#else
ASSERT_SUBSTR("undefined symbol: test", dlerror()); // glibc isn't specific about the failure.
#endif
#endif // !defined(__LP64__)
// NULL symbol name.
#if defined(__BIONIC__)