[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-e54b34aed1c4082ed03f4d1f7a19276059b1e30a@git.kernel.org>
Date: Fri, 6 Jul 2012 04:19:09 -0700
From: tip-bot for Namhyung Kim <namhyung.kim@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
namhyung.kim@....com, namhyung@...nel.org, bp@...en8.de,
namhyung@...il.com, fweisbec@...il.com, rostedt@...dmis.org,
acme@...radead.org, dsahern@...il.com, tglx@...utronix.de
Subject: [tip:perf/core] tools lib traceevent: Check result of malloc()
during reading token
Commit-ID: e54b34aed1c4082ed03f4d1f7a19276059b1e30a
Gitweb: http://git.kernel.org/tip/e54b34aed1c4082ed03f4d1f7a19276059b1e30a
Author: Namhyung Kim <namhyung.kim@....com>
AuthorDate: Mon, 23 Apr 2012 13:58:36 +0900
Committer: Namhyung Kim <namhyung@...nel.org>
CommitDate: Wed, 4 Jul 2012 13:40:31 +0900
tools lib traceevent: Check result of malloc() during reading token
The malloc can fail so the return value should be checked. For now,
just use malloc_or_die().
Signed-off-by: Namhyung Kim <namhyung.kim@....com>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Namhyung Kim <namhyung@...il.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Arnaldo Carvalho de Melo <acme@...radead.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: David Ahern <dsahern@...il.com>
Link: http://lkml.kernel.org/r/1335157118-14658-10-git-send-email-namhyung.kim@lge.com
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
Signed-off-by: Namhyung Kim <namhyung@...nel.org>
---
tools/lib/traceevent/parse-filter.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 80d872a..d54c2b4 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -96,7 +96,7 @@ static enum event_type read_token(char **tok)
(strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&
pevent_peek_char() == '~') {
/* append it */
- *tok = malloc(3);
+ *tok = malloc_or_die(3);
sprintf(*tok, "%c%c", *token, '~');
free_token(token);
/* Now remove the '~' from the buffer */
--
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