X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=2bbd492a3ff7fd2aaaaa331b159bc1c504230607;hp=e09f071578d3f968b5fb2d19e37a1f4787d853f7;hb=642b7593c3b3488d229488a436bab294dcc27ee9;hpb=99a2af6f45b356324e99acf0da809ca416eed0de diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index e09f0715..2bbd492a 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -886,7 +886,7 @@ void *__dynlink(int argc, char **argv) void *dlopen(const char *file, int mode) { - struct dso *volatile p, *orig_tail = tail, *next; + struct dso *volatile p, *orig_tail, *next; size_t i; int cs; @@ -895,6 +895,8 @@ void *dlopen(const char *file, int mode) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); pthread_rwlock_wrlock(&lock); + orig_tail = tail; + if (setjmp(rtld_fail)) { /* Clean up anything new that was (partially) loaded */ if (p->deps) for (i=0; p->deps[i]; i++)