From: Mark Wielaard <mark@klomp.org>
Date: Thu, 18 Oct 2018 21:15:48 +0000 (+0200)
Subject: size: Handle recursive ELF ar files.
X-Git-Tag: elfutils-0.175~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22d2d082d57a7470fadc0eae67179553f4919209;p=thirdparty%2Felfutils.git

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>
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 92beb1bbf..a6ab09316 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/src/size.c b/src/size.c
index 5ff3f2af7..f01fd880c 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;
 }