diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-04-17 14:29:40 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-04-17 14:29:40 -0700 |
| commit | 2bd2cad9e8a410643e80efa0b15f6f2882e1271b (patch) | |
| tree | fa939126506e51673f782d01ca439e5f6080f64d /elf/dl-close.c | |
| parent | 328c44c3670ebf6c1bd790acddce65a12998cd6c (diff) | |
| download | glibc-2bd2cad9e8a410643e80efa0b15f6f2882e1271b.tar glibc-2bd2cad9e8a410643e80efa0b15f6f2882e1271b.tar.gz glibc-2bd2cad9e8a410643e80efa0b15f6f2882e1271b.tar.bz2 glibc-2bd2cad9e8a410643e80efa0b15f6f2882e1271b.zip | |
Avoid confusing compiler with dynamically impossible statically invalid dereference in _dl_close_worker.
Diffstat (limited to 'elf/dl-close.c')
| -rw-r--r-- | elf/dl-close.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index cf8f9e0465..412f71d70b 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -641,9 +641,16 @@ _dl_close_worker (struct link_map *map) DL_UNMAP (imap); /* Finally, unlink the data structure and free it. */ - if (imap->l_prev != NULL) - imap->l_prev->l_next = imap->l_next; - else +#if DL_NNS == 1 + /* The assert in the (imap->l_prev == NULL) case gives + the compiler license to warn that NS points outside + the dl_ns array bounds in that case (as nsid != LM_ID_BASE + is tantamount to nsid >= DL_NNS). That should be impossible + in this configuration, so just assert about it instead. */ + assert (nsid == LM_ID_BASE); + assert (imap->l_prev != NULL); +#else + if (imap->l_prev == NULL) { assert (nsid != LM_ID_BASE); ns->_ns_loaded = imap->l_next; @@ -652,6 +659,9 @@ _dl_close_worker (struct link_map *map) we leave for debuggers to examine. */ r->r_map = (void *) ns->_ns_loaded; } + else +#endif + imap->l_prev->l_next = imap->l_next; --ns->_ns_nloaded; if (imap->l_next != NULL) |