diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-04-13 14:18:28 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-04-13 14:19:04 +0200 |
| commit | 4a41fc3cd9cea9223ea4f13f9c766a1e149a0ccc (patch) | |
| tree | 363f7e95486faf2135e589cfcf2236f540853572 /elf | |
| parent | 45a8e05785a617683bbaf83f756cada7a4a425b9 (diff) | |
| download | glibc-4a41fc3cd9cea9223ea4f13f9c766a1e149a0ccc.zip glibc-4a41fc3cd9cea9223ea4f13f9c766a1e149a0ccc.tar.gz glibc-4a41fc3cd9cea9223ea4f13f9c766a1e149a0ccc.tar.bz2 | |
elf: Fix memory leak in _dl_find_object_update (bug 29062)
The count can be zero if an object has already been loaded as
an indirect dependency (so that l_searchlist.r_list in its link
map is still NULL) is promoted to global scope via RTLD_GLOBAL.
Fixes commit 5d28a8962dc ("elf: Add _dl_find_object function").
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-find_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c index 2b8df2f..4d5831b 100644 --- a/elf/dl-find_object.c +++ b/elf/dl-find_object.c @@ -788,6 +788,9 @@ _dl_find_object_update (struct link_map *new_map) for (struct link_map *l = new_map; l != NULL; l = l->l_next) /* Skip proxy maps and already-processed maps. */ count += l == l->l_real && !l->l_find_object_processed; + if (count == 0) + return true; + struct link_map **map_array = malloc (count * sizeof (*map_array)); if (map_array == NULL) return false; @@ -797,8 +800,6 @@ _dl_find_object_update (struct link_map *new_map) if (l == l->l_real && !l->l_find_object_processed) map_array[i++] = l; } - if (count == 0) - return true; _dl_find_object_link_map_sort (map_array, count); bool ok = _dl_find_object_update_1 (map_array, count); |