AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-10 19:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle NULL return from htab_find_slot()

Browse Source
This commit is contained in:
Marcus Shawcroft 2013-11-13 12:37:41 +00:00
parent 7ddace62b0
commit a615be4675
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-11-13 Marcus Shawcroft <marcus.shawcroft@linaro.org>
* elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure
of htab_find_slot().
2013-11-11 David S. Miller <davem@davemloft.net> 2013-11-11 David S. Miller <davem@davemloft.net>
[BZ #16150] [BZ #16150]

6
elf/tlsdeschtab.h
View File

@ -102,6 +102,12 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset)
test.tlsinfo.ti_module = map->l_tls_modid; test.tlsinfo.ti_module = map->l_tls_modid;
test.tlsinfo.ti_offset = ti_offset; test.tlsinfo.ti_offset = ti_offset;
entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc); entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc);
if (! entry)
{
__rtld_lock_unlock_recursive (GL(dl_load_lock));
return 0;
}
if (*entry) if (*entry)
{ {
td = *entry; td = *entry;