X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;fp=src%2Fldso%2Fdynlink.c;h=efbec8fbc28ca72e7dd3977597752e0513ae9cb4;hp=b1a4409dc17c1066e6774d7e045e7b2c5d576b06;hb=74025c80ce1eb4cda110ab2e3ac11718d3c6f2ff;hpb=72768ea99e67162b7b42d9cd8917cf9a2c00f1f1 diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index b1a4409d..efbec8fb 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -435,7 +435,6 @@ static struct dso *load_library(const char *name) char buf[2*NAME_MAX+2]; const char *pathname; unsigned char *map; - size_t map_len; struct dso *p, temp_dso = {0}; int fd; struct stat st; @@ -528,7 +527,7 @@ static struct dso *load_library(const char *name) } p = calloc(1, alloc_size); if (!p) { - munmap(map, map_len); + munmap(map, temp_dso.map_len); return 0; } memcpy(p, &temp_dso, sizeof temp_dso); @@ -542,8 +541,8 @@ static struct dso *load_library(const char *name) if (pathname != name) p->shortname = strrchr(p->name, '/')+1; if (p->tls_image) { if (runtime && !__pthread_self_init()) { + munmap(map, p->map_len); free(p); - munmap(map, map_len); return 0; } p->tls_id = ++tls_cnt;