From: Mark Wielaard <mark@klomp.org>
Date: Fri, 18 Mar 2022 15:01:20 +0000 (+0100)
Subject: libdwfl: Close ar members when they cannot be processed.
X-Git-Tag: elfutils-0.187~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e142c560bf599627056efd6deb41af36a7163dd;p=thirdparty%2Felfutils.git

libdwfl: Close ar members when they cannot be processed.

When reporting ar members they should be closed when they cannot
be processed. A comment in offline.c said that process_file called
elf_end if it returned NULL. But this is incorrect. And other places
that call process_file do call elf_end explicitly when it returns
NULL.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index b2588b129..182f4e34b 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2022-02-18  Mark Wielaard  <mark@klomp.org>
+
+	* offline.c (process_archive_member): Close member if process_file
+	failed.
+
 2022-01-03  Mark Wielaard  <mark@klomp.org>
 
 	* link_map.c (dwfl_link_map_report): Only declare d32 and d64 before
diff --git a/libdwfl/offline.c b/libdwfl/offline.c
index d8697cf28..58ba4c369 100644
--- a/libdwfl/offline.c
+++ b/libdwfl/offline.c
@@ -1,5 +1,6 @@
 /* Recover relocatibility for addresses computed from debug information.
    Copyright (C) 2005-2009, 2012 Red Hat, Inc.
+   Copyright (C) 2022 Mark J. Wielaard <mark@klomp.org>
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -233,8 +234,11 @@ process_archive_member (Dwfl *dwfl, const char *name, const char *file_name,
   free (member_name);
   free (module_name);
 
-  if (*mod == NULL)		/* process_file called elf_end.  */
-    return ELF_C_NULL;
+  if (*mod == NULL)
+    {
+      elf_end (member);
+      return ELF_C_NULL;
+    }
 
   /* Advance the archive-reading offset for the next iteration.  */
   return elf_next (member);