X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=39a276088fe106c8f33e653bb2eae4918adb756e;hp=2ec8fb8c4985b92a782a3a692e3b3884178480f7;hb=deb15b3cf23cb6093f439f7b37eaeb1263df5399;hpb=9ec4283b28cf676292fd5c6f681bef1e90e30c18;ds=sidebyside diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 2ec8fb8c..39a27608 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -1080,11 +1080,14 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra) uint32_t h = 0, gh = 0; Sym *sym; if (p == head || p == RTLD_DEFAULT || p == RTLD_NEXT) { - if (p == RTLD_NEXT) { + if (p == RTLD_DEFAULT) { + p = head; + } else if (p == RTLD_NEXT) { for (p=head; p && (unsigned char *)ra-p->map>p->map_len; p=p->next); if (!p) p=head; + p = p->next; } - struct symdef def = find_sym(p->next, s, 0); + struct symdef def = find_sym(p, s, 0); if (!def.sym) goto failed; return def.dso->base + def.sym->st_value; }