aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <[email protected]>2013-12-10 15:26:55 -0300
committerArnaldo Carvalho de Melo <[email protected]>2013-12-10 16:51:10 -0300
commitee021d42238daadc7ba49274bb0ba7dff219c6ab (patch)
tree204b65fc9b3543e090ce762796853f1cf2018e21
parentbf4414ae7b86cddca60a5b510954a37d30583a1f (diff)
perf symbols: Set freed members to NULL in dso destructor
To help in debugging use after free bugs. Reported-by: Ingo Molnar <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/util/dso.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 2c7e1899a735..19babb0d365d 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -475,13 +475,23 @@ void dso__delete(struct dso *dso)
int i;
for (i = 0; i < MAP__NR_TYPES; ++i)
symbols__delete(&dso->symbols[i]);
- if (dso->short_name_allocated)
+
+ if (dso->short_name_allocated) {
free((char *)dso->short_name);
- if (dso->long_name_allocated)
+ dso->short_name = NULL;
+ dso->short_name_allocated = false;
+ }
+
+ if (dso->long_name_allocated) {
free((char *)dso->long_name);
+ dso->long_name = NULL;
+ dso->long_name_allocated = false;
+ }
+
dso_cache__free(&dso->cache);
dso__free_a2l(dso);
free(dso->symsrc_filename);
+ dso->symsrc_filename = NULL;
free(dso);
}