[tip:perf/core] tools lib traceevent: Check result of malloc() during reading token

From: tip-bot for Namhyung Kim
Date: Fri Jul 06 2012 - 07:19:36 EST


Commit-ID: e54b34aed1c4082ed03f4d1f7a19276059b1e30a
Gitweb: http://git.kernel.org/tip/e54b34aed1c4082ed03f4d1f7a19276059b1e30a
Author: Namhyung Kim <namhyung.kim@xxxxxxx>
AuthorDate: Mon, 23 Apr 2012 13:58:36 +0900
Committer: Namhyung Kim <namhyung@xxxxxxxxxx>
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@xxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1335157118-14658-10-git-send-email-namhyung.kim@xxxxxxx
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
---
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/