mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Sasha Levin <sasha.levin@oracle.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org,
	sasha.levin@oracle.com, hpa@zytor.com, mingo@kernel.org,
	namhyung@kernel.org, fweisbec@gmail.com, rostedt@goodmis.org,
	tglx@linutronix.de
Subject: [tip:perf/core] tools lib traceevent: test correct variable after allocation
Date: Fri, 25 Jan 2013 03:25:53 -0800	[thread overview]
Message-ID: <tip-fba7a78220fd969beeaa9abbb97c5f7027a7b4fd@git.kernel.org> (raw)
In-Reply-To: <1356120062-2648-1-git-send-email-sasha.levin@oracle.com>

Commit-ID:  fba7a78220fd969beeaa9abbb97c5f7027a7b4fd
Gitweb:     http://git.kernel.org/tip/fba7a78220fd969beeaa9abbb97c5f7027a7b4fd
Author:     Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Fri, 21 Dec 2012 15:00:58 -0500
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 24 Jan 2013 16:40:16 -0300

tools lib traceevent: test correct variable after allocation

we've tested the wrong variable for allocation failure, fix it to
test the right one.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1356120062-2648-1-git-send-email-sasha.levin@oracle.com
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 5a824e3..7538a1f 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -2481,7 +2481,7 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char **
 
 	free_token(token);
 	arg = alloc_arg();
-	if (!field) {
+	if (!arg) {
 		do_warning("%s: not enough memory!", __func__);
 		*tok = NULL;
 		return EVENT_ERROR;

      parent reply	other threads:[~2013-01-25 11:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-21 20:00 [PATCH] " Sasha Levin
2012-12-26  4:28 ` Namhyung Kim
2013-01-25 11:25 ` tip-bot for Sasha Levin [this message]

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=tip-fba7a78220fd969beeaa9abbb97c5f7027a7b4fd@git.kernel.org \
    --to=sasha.levin@oracle.com \
    --cc=acme@redhat.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /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

Powered by JetHome