jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't crash if TLS library is loaded into process with no thread pointer

Browse source
This commit is contained in:
Rich Felker 2012-10-06 16:56:35 -04:00
commit 92e1cd9b0b
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ldso/dynlink.c
View file

@ -533,6 +533,11 @@ static struct dso *load_library(const char *name)
/* Add a shortname only if name arg was not an explicit pathname. */ /* Add a shortname only if name arg was not an explicit pathname. */
if (pathname != name) p->shortname = strrchr(p->name, '/')+1; if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
if (p->tls_image) { if (p->tls_image) {
if (!__pthread_self_init()) {
free(p);
munmap(map, map_len);
return 0;
}
p->tls_id = ++tls_cnt; p->tls_id = ++tls_cnt;
tls_align = MAXP2(tls_align, p->tls_align); tls_align = MAXP2(tls_align, p->tls_align);
tls_offset += p->tls_size + p->tls_align - 1; tls_offset += p->tls_size + p->tls_align - 1;