From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423115AbcFHIpe (ORCPT ); Wed, 8 Jun 2016 04:45:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54166 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161753AbcFHIpb (ORCPT ); Wed, 8 Jun 2016 04:45:31 -0400 Date: Wed, 8 Jun 2016 01:44:54 -0700 From: tip-bot for Taeung Song Message-ID: Cc: treeze.taeung@gmail.com, acme@redhat.com, hpa@zytor.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org, peterz@infradead.org, namhyung@kernel.org, alexander.shishkin@linux.intel.com, mingo@kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, mingo@kernel.org, alexander.shishkin@linux.intel.com, peterz@infradead.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org, mhiramat@kernel.org, hpa@zytor.com, acme@redhat.com, treeze.taeung@gmail.com In-Reply-To: <1465291577-20973-2-git-send-email-treeze.taeung@gmail.com> References: <1465291577-20973-2-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Constructor should free its allocated memory when failing Git-Commit-ID: 25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6 Gitweb: http://git.kernel.org/tip/25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6 Author: Taeung Song AuthorDate: Tue, 7 Jun 2016 18:26:11 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 10:58:55 -0300 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 Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1465291577-20973-2-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index c73f1c4..e086f59 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -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;