Commit 25d8f48f authored Jun 07, 2016 by Taeung Song Committed by Arnaldo Carvalho de Melo Jun 07, 2016

perf config: Constructor should free its allocated memory when failing



Because of die() at perf_parse_file() a config set was freed in
collect_config(), if failed.  But it is natural to free a config set
after collect_config() is done when some problems happened.

So, in case of failure, lastly free a config set at perf_config_set__new()
instead of freeing the config set in collect_config().

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1465291577-20973-2-git-send-email-treeze.taeung@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent c58c49ac

tools/perf/util/config.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -643,7 +643,6 @@ static int collect_config(const char var, const char value,

		out_free:
		free(key);
		perf_config_set__delete(set);
		return -1;
		}

		@@ -653,7 +652,10 @@ struct perf_config_set *perf_config_set__new(void)

		if (set) {
		INIT_LIST_HEAD(&set->sections);
		perf_config(collect_config, set);
		if (perf_config(collect_config, set) < 0) {
		perf_config_set__delete(set);
		set = NULL;
		}
		}

		return set;

Admin message