public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Ingo Molnar <mingo@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Namhyung Kim <namhyung.kim@lge.com>
Subject: [PATCH 1/4] tools lib traceevent: Fix error path on process_array()
Date: Wed, 19 Sep 2012 15:58:41 +0900	[thread overview]
Message-ID: <1348037924-17568-2-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1348037924-17568-1-git-send-email-namhyung@kernel.org>

From: Namhyung Kim <namhyung.kim@lge.com>

free_token() under out_free should be called with 'token' and no need
to set *tok to NULL since it's set already.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/lib/traceevent/event-parse.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index ee4fa1912542..11f76a59711f 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -1636,8 +1636,7 @@ process_array(struct event_format *event, struct print_arg *top, char **tok)
 	return type;
 
 out_free:
-	free_token(*tok);
-	*tok = NULL;
+	free_token(token);
 	free_arg(arg);
 	return EVENT_ERROR;
 }
-- 
1.7.11.4


  reply	other threads:[~2012-09-19  7:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-19  6:58 [PATCH 0/4] tools lib traceevent: Small fixes on error handling path Namhyung Kim
2012-09-19  6:58 ` Namhyung Kim [this message]
2012-09-27  5:36   ` [tip:perf/core] tools lib traceevent: Fix error path on process_array() tip-bot for Namhyung Kim
2012-09-19  6:58 ` [PATCH 2/4] tools lib traceevent: Make sure that arg->op.right is set properly Namhyung Kim
2012-09-27  5:37   ` [tip:perf/core] tools lib traceevent: Make sure that arg->op. right " tip-bot for Namhyung Kim
2012-09-19  6:58 ` [PATCH 3/4] tools lib traceevent: Free field if an error occurs on process_fields Namhyung Kim
2012-09-27  5:38   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-09-19  6:58 ` [PATCH 4/4] tools lib traceevent: Free field if an error occurs on process_flags/symbols Namhyung Kim
2012-09-27  5:39   ` [tip:perf/core] " tip-bot for Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1348037924-17568-2-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@ghostprotocols.net \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung.kim@lge.com \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox