X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=9692c6b0138080f9a1d1da74403b9d6508977c36;hb=a749ba3adc2f3b4abfc68b21d4c3741b20c8f657;hp=31ef68474b339da9e018f76750755da4ddb1193d;hpb=7d9a5c6af7738abe31d7631d6ae7194f94e850eb;p=musl

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 31ef6847..9692c6b0 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -76,6 +76,7 @@ static int rtld_used;
 static int ssp_used;
 static int runtime;
 static int ldd_mode;
+static int ldso_fail;
 static jmp_buf rtld_fail;
 static pthread_rwlock_t lock;
 static struct debug debug;
@@ -171,7 +172,8 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
 					dso->name, name);
 				if (runtime) longjmp(rtld_fail, 1);
 				dprintf(2, "%s\n", errbuf);
-				_exit(127);
+				ldso_fail = 1;
+				continue;
 			}
 			sym_size = sym->st_size;
 		} else {
@@ -450,7 +452,8 @@ static void load_deps(struct dso *p)
 					p->strings + p->dynv[i+1], p->name);
 				if (runtime) longjmp(rtld_fail, 1);
 				dprintf(2, "%s\n", errbuf);
-				_exit(127);
+				ldso_fail = 1;
+				continue;
 			}
 			if (runtime) {
 				tmp = realloc(*deps, sizeof(*tmp)*(ndeps+2));
@@ -682,6 +685,7 @@ void *__dynlink(int argc, char **argv)
 	reloc_all(app->next);
 	reloc_all(app);
 
+	if (ldso_fail) _exit(127);
 	if (ldd_mode) _exit(0);
 
 	/* Switch to runtime mode: any further failures in the dynamic
@@ -803,7 +807,7 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
 	if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
 		return p->base + sym->st_value;
 	if (p->deps) for (i=0; p->deps[i]; i++) {
-		sym = lookup(s, h, p);
+		sym = lookup(s, h, p->deps[i]);
 		if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
 			return p->deps[i]->base + sym->st_value;
 	}