diff options
author | Mark Wielaard <mark@klomp.org> | 2018-10-18 23:15:48 +0200 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2018-10-20 00:13:10 +0200 |
commit | 22d2d082d57a7470fadc0eae67179553f4919209 (patch) | |
tree | 86d8f8eb2149ce29378168405a2a45caaa38e7e3 | |
parent | 2b16a9be69939822dcafe075413468daac98b327 (diff) |
size: Handle recursive ELF ar files.
eu-size didn't handle an ELF ar file that contained an ar file itself
correctly. handle_ar would recursively call itself but close the ELF
file before returning. Only close the ELF file at the top-level.
https://sourceware.org/bugzilla/show_bug.cgi?id=23787
Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/size.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 92beb1bb..a6ab0931 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2018-10-18 Mark Wielaard <mark@klomp.org> + * size.c (handle_ar): Only close elf if prefix was NULL. + +2018-10-18 Mark Wielaard <mark@klomp.org> + * arlib.c (arlib_add_symbols): Check that sh_entsize is not zero. 2018-10-14 Mark Wielaard <mark@klomp.org> @@ -374,8 +374,10 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname) INTERNAL_ERROR (fname); } - if (unlikely (elf_end (elf) != 0)) - INTERNAL_ERROR (fname); + /* Only close ELF handle if this was a "top level" ar file. */ + if (prefix == NULL) + if (unlikely (elf_end (elf) != 0)) + INTERNAL_ERROR (fname); return result; } |