summaryrefslogtreecommitdiff
path: root/libdw
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2018-06-05 22:41:45 +0200
committerMark Wielaard <mark@klomp.org>2018-06-08 12:03:14 +0200
commitab92149d354207f55e912c264a72a258f0132e02 (patch)
treebb7521a6cfcbad3423aee0f5ba8309025e47c73d /libdw
parent7009db70ca21d2b26cabd1c9fa1a50c35b6342b1 (diff)
downloadelfutils-ab92149d354207f55e912c264a72a258f0132e02.tar.gz
libdw: Don't leak arange if we cannot figure out which CU it belongs to.
In the unlikely case that __libdw_findcu fails to find the associated CU we would leak one arange because it wasn't linked into the arangelist list yet. Make sure to free it immediately. Signed-off-by: Mark Wielaard <mark@klomp.org>
Diffstat (limited to 'libdw')
-rw-r--r--libdw/ChangeLog5
-rw-r--r--libdw/dwarf_getaranges.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index f0ce901d..661fa9df 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,10 @@
2018-06-05 Mark Wielaard <mark@klomp.org>
+ * dwarf_getaranges (dwarf_getaranges): Free new_arange if
+ __libdw_findcu fails.
+
+2018-06-05 Mark Wielaard <mark@klomp.org>
+
* dwarf_getsrclines.c (read_srclines): Define dirarray early and
check whether or not it is equal to dirstack on exit/out before
cleanup.
diff --git a/libdw/dwarf_getaranges.c b/libdw/dwarf_getaranges.c
index 50a98cf1..bff9c860 100644
--- a/libdw/dwarf_getaranges.c
+++ b/libdw/dwarf_getaranges.c
@@ -197,7 +197,12 @@ dwarf_getaranges (Dwarf *dbg, Dwarf_Aranges **aranges, size_t *naranges)
/* We store the actual CU DIE offset, not the CU header offset. */
Dwarf_CU *cu = __libdw_findcu (dbg, offset, false);
if (unlikely (cu == NULL))
- goto fail;
+ {
+ /* We haven't gotten a chance to link in the new_arange
+ into the arangelist, don't leak it. */
+ free (new_arange);
+ goto fail;
+ }
new_arange->arange.offset = __libdw_first_die_off_from_cu (cu);
new_arange->next = arangelist;