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 <m...@klomp.org> --- src/ChangeLog | 4 ++++ src/size.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ef582dd..3d2214f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2018-10-18 Mark Wielaard <m...@klomp.org> + * size.c (handle_ar): Only close elf if prefix was NULL. + +2018-10-18 Mark Wielaard <m...@klomp.org> + * arlib.c (arlib_add_symbols): Check that sh_entsize is not zero. 2018-10-14 Mark Wielaard <m...@klomp.org> diff --git a/src/size.c b/src/size.c index 5ff3f2a..f01fd88 100644 --- a/src/size.c +++ b/src/size.c @@ -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; } -- 1.8.3.1
