From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932351AbbGCHtJ (ORCPT ); Fri, 3 Jul 2015 03:49:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36154 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932329AbbGCHs4 (ORCPT ); Fri, 3 Jul 2015 03:48:56 -0400 Date: Fri, 3 Jul 2015 00:48:44 -0700 From: tip-bot for Taeung Song Message-ID: Cc: mingo@kernel.org, treeze.taeung@gmail.com, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: namhyung@kernel.org, treeze.taeung@gmail.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org, hpa@zytor.com In-Reply-To: <1435652124-22414-6-git-send-email-treeze.taeung@gmail.com> References: <1435652124-22414-6-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf report: Fill in the missing session freeing after an error occurs Git-Commit-ID: 07a716fff25b826461baa2a07faa2df8c171f220 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: 07a716fff25b826461baa2a07faa2df8c171f220 Gitweb: http://git.kernel.org/tip/07a716fff25b826461baa2a07faa2df8c171f220 Author: Taeung Song AuthorDate: Tue, 30 Jun 2015 17:15:24 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 1 Jul 2015 17:53:49 -0300 perf report: Fill in the missing session freeing after an error occurs When an error occurs an error value is just returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occurs. Signed-off-by: Taeung Song Acked-by: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1435652124-22414-6-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-report.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 348bed4..95a4771 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -839,8 +839,10 @@ repeat: if (report.header || report.header_only) { perf_session__fprintf_info(session, stdout, report.show_full_info); - if (report.header_only) - return 0; + if (report.header_only) { + ret = 0; + goto error; + } } else if (use_browser == 0) { fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n", stdout);