From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753117AbbF3LVz (ORCPT ); Tue, 30 Jun 2015 07:21:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50779 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752426AbbF3LVs (ORCPT ); Tue, 30 Jun 2015 07:21:48 -0400 Date: Tue, 30 Jun 2015 13:21:46 +0200 From: Jiri Olsa To: Taeung Song Cc: Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org, namhyung@kernel.org, Ingo Molnar Subject: Re: [PATCH 1/5] perf inject: Fill in the missing freeing a session after an error occur Message-ID: <20150630112146.GD25631@krava.brq.redhat.com> References: <1435652124-22414-1-git-send-email-treeze.taeung@gmail.com> <1435652124-22414-2-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435652124-22414-2-git-send-email-treeze.taeung@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 30, 2015 at 05:15:20PM +0900, Taeung Song wrote: > When an error occur a 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 occur. > > Signed-off-by: Taeung Song Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/builtin-inject.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c > index 52ec66b..01b0649 100644 > --- a/tools/perf/builtin-inject.c > +++ b/tools/perf/builtin-inject.c > @@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) > if (inject.session == NULL) > return -1; > > - if (symbol__init(&inject.session->header.env) < 0) > - return -1; > + ret = symbol__init(&inject.session->header.env); > + if (ret < 0) > + goto out_delete; > > ret = __cmd_inject(&inject); > > +out_delete: > perf_session__delete(inject.session); > - > return ret; > } > -- > 1.9.1 >