From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755803AbcEaR1R (ORCPT ); Tue, 31 May 2016 13:27:17 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:33388 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755680AbcEaR1H (ORCPT ); Tue, 31 May 2016 13:27:07 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Taeung Song , Jiri Olsa Subject: [BUGFIX][PATCH v5 2/9] perf config: Finally free a config set after collect_config() worked Date: Wed, 1 Jun 2016 02:26:42 +0900 Message-Id: <1464715609-12401-3-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464715609-12401-1-git-send-email-treeze.taeung@gmail.com> References: <1464715609-12401-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current colllect_config() free a config set on failure. But it is needed to finally free it at perf_config_set__new() after collect_config() worked. Cc: Namhyung Kim Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Alexander Shishkin Signed-off-by: Taeung Song --- tools/perf/util/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index b500737..d013f90 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -639,7 +639,6 @@ static int collect_config(const char *var, const char *value, out_free: free(key); - perf_config_set__delete(set); return -1; } @@ -649,7 +648,8 @@ 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); } return set; -- 2.5.0