[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-fba7a78220fd969beeaa9abbb97c5f7027a7b4fd@git.kernel.org>
Date: Fri, 25 Jan 2013 03:25:53 -0800
From: tip-bot for Sasha Levin <sasha.levin@...cle.com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org,
sasha.levin@...cle.com, hpa@...or.com, mingo@...nel.org,
namhyung@...nel.org, fweisbec@...il.com, rostedt@...dmis.org,
tglx@...utronix.de
Subject: [tip:perf/core] tools lib traceevent:
test correct variable after allocation
Commit-ID: fba7a78220fd969beeaa9abbb97c5f7027a7b4fd
Gitweb: http://git.kernel.org/tip/fba7a78220fd969beeaa9abbb97c5f7027a7b4fd
Author: Sasha Levin <sasha.levin@...cle.com>
AuthorDate: Fri, 21 Dec 2012 15:00:58 -0500
Committer: Arnaldo Carvalho de Melo <acme@...hat.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@...il.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Steven Rostedt <rostedt@...dmis.org>
Link: http://lkml.kernel.org/r/1356120062-2648-1-git-send-email-sasha.levin@oracle.com
Signed-off-by: Sasha Levin <sasha.levin@...cle.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists