* [PATCH] size: Handle recursive ELF ar files.
@ 2018-10-18 23:02 Mark Wielaard
2018-10-19 22:58 ` Mark Wielaard
0 siblings, 1 reply; 2+ messages in thread
From: Mark Wielaard @ 2018-10-18 23:02 UTC (permalink / raw)
To: elfutils-devel; +Cc: Mark Wielaard
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>
---
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 <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>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] size: Handle recursive ELF ar files.
2018-10-18 23:02 [PATCH] size: Handle recursive ELF ar files Mark Wielaard
@ 2018-10-19 22:58 ` Mark Wielaard
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wielaard @ 2018-10-19 22:58 UTC (permalink / raw)
To: elfutils-devel
On Fri, 2018-10-19 at 01:02 +0200, Mark Wielaard wrote:
> 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.
Pushed to master.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-19 22:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-18 23:02 [PATCH] size: Handle recursive ELF ar files Mark Wielaard
2018-10-19 22:58 ` Mark Wielaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).