aboutsummaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2018-12-28 03:43:15 +0000
committerTom de Vries <tdevries@suse.de>2018-12-28 03:43:15 +0000
commit1e9af1e784392b2b8b5673766dc2246860382a5f (patch)
treebb5714dffebc534c285ee313fee9c02d9645cbce /libbacktrace
parentb0834577b6b1670046307154fe5ef1cd268679c2 (diff)
[libbacktrace] Fix memory leak in build_address_map
While upon failure in build_address_map we call free_unit_addrs_vector, this does not actually free the addrs vector, but merely the abbrevs of the units pointed at by the elements of the addrs vector. Fix this by adding code to build_address_map to make sure that the addrs vector is freed upon failure. Bootstrapped and reg-tested on x86_64. 2018-12-28 Tom de Vries <tdevries@suse.de> * dwarf.c (build_address_map): Free addrs vector upon failure. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@267442 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog4
-rw-r--r--libbacktrace/dwarf.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index d3d964b24b2..60e5f03d0f2 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-28 Tom de Vries <tdevries@suse.de>
+
+ * dwarf.c (build_address_map): Free addrs vector upon failure.
+
2018-12-14 Tom de Vries <tdevries@suse.de>
PR testsuite/88491
diff --git a/libbacktrace/dwarf.c b/libbacktrace/dwarf.c
index 48ef3638a5f..37a08ca29a8 100644
--- a/libbacktrace/dwarf.c
+++ b/libbacktrace/dwarf.c
@@ -1552,6 +1552,11 @@ build_address_map (struct backtrace_state *state, uintptr_t base_address,
fail:
free_abbrevs (state, &abbrevs, error_callback, data);
free_unit_addrs_vector (state, addrs, error_callback, data);
+ if (addrs->count > 0)
+ {
+ backtrace_vector_free (state, &addrs->vec, error_callback, data);
+ addrs->count = 0;
+ }
return 0;
}