2013-09-11 20:08:37 +08:00
|
|
|
--- a/ldso/libdl/libdl.c
|
|
|
|
|
+++ b/ldso/libdl/libdl.c
|
|
|
|
|
@@ -671,7 +671,7 @@ static void *do_dlsym(void *vhandle, con
|
2012-11-12 00:10:50 +08:00
|
|
|
{
|
|
|
|
|
struct elf_resolve *tpnt, *tfrom;
|
|
|
|
|
struct dyn_elf *handle;
|
|
|
|
|
- ElfW(Addr) from;
|
|
|
|
|
+ ElfW(Addr) from = 0;
|
|
|
|
|
struct dyn_elf *rpnt;
|
|
|
|
|
void *ret;
|
|
|
|
|
struct symbol_ref sym_ref = { NULL, NULL };
|
2013-09-11 20:08:37 +08:00
|
|
|
@@ -729,7 +729,12 @@ static void *do_dlsym(void *vhandle, con
|
2012-11-12 00:10:50 +08:00
|
|
|
tpnt = NULL;
|
|
|
|
|
if (handle == _dl_symbol_tables)
|
|
|
|
|
tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
|
|
|
|
|
- ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
|
|
|
|
|
+ do {
|
|
|
|
|
+ ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
|
|
|
|
|
+ if (ret != NULL)
|
|
|
|
|
+ break;
|
|
|
|
|
+ handle = handle->next;
|
|
|
|
|
+ } while (from && handle);
|
|
|
|
|
|
|
|
|
|
#if defined(USE_TLS) && USE_TLS && defined SHARED
|
|
|
|
|
if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
|
