From ee021d42238daadc7ba49274bb0ba7dff219c6ab Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 10 Dec 2013 15:26:55 -0300 Subject: [PATCH] perf symbols: Set freed members to NULL in dso destructor To help in debugging use after free bugs. Reported-by: Ingo Molnar Cc: Adrian Hunter Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-3ckwsob2g1q23s77nuhexrq7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 14 ++++++++++++-- 1 file 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); } -- 2.30.2