perf_config_set__delete() delete allocated the config set but the global variable 'config_set' is used all around.
So purge and zfree by an address of the global variable , i.e. 'struct perf_config_set **' type instead of using local variable 'set' of which type is 'struct perf_config_set *'. Cc: Namhyung Kim <namhy...@kernel.org> Cc: Jiri Olsa <jo...@redhat.com> Cc: Masami Hiramatsu <mhira...@kernel.org> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Signed-off-by: Taeung Song <treeze.tae...@gmail.com> --- tools/perf/builtin-config.c | 2 +- tools/perf/util/config.c | 11 +++++++---- tools/perf/util/config.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index b3bc01a..f23fe52 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -105,7 +105,7 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) usage_with_options(config_usage, config_options); } - perf_config_set__delete(config_set); + perf_config_set__delete(&config_set); out_err: return ret; } diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index adf2bad..79ded23 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -642,7 +642,7 @@ static int collect_config(const char *var, const char *value, out_free: free(key); - perf_config_set__delete(set); + perf_config_set__delete(&set); return -1; } @@ -740,10 +740,13 @@ static void perf_config_set__purge(struct perf_config_set *set) } } -void perf_config_set__delete(struct perf_config_set *set) +void perf_config_set__delete(struct perf_config_set **set) { - perf_config_set__purge(set); - free(set); + if (*set == NULL) + return; + + perf_config_set__purge(*set); + zfree(set); } /* diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index ea157a4..271b429 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -23,6 +23,6 @@ struct perf_config_set { extern struct perf_config_set *config_set; struct perf_config_set *perf_config_set__new(void); -void perf_config_set__delete(struct perf_config_set *set); +void perf_config_set__delete(struct perf_config_set **set); #endif /* __PERF_CONFIG_H */ -- 2.5.0