projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
234520d
)
tools lib traceevent: Get rid of die() in create_arg_item()
author
Namhyung Kim
<namhyung@kernel.org>
Mon, 9 Dec 2013 05:34:05 +0000
(14:34 +0900)
committer
Arnaldo Carvalho de Melo
<acme@redhat.com>
Mon, 9 Dec 2013 18:39:46 +0000
(15:39 -0300)
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link:
http://lkml.kernel.org/r/1386567251-22751-9-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/parse-filter.c
patch
|
blob
|
history
diff --git
a/tools/lib/traceevent/parse-filter.c
b/tools/lib/traceevent/parse-filter.c
index 2b73abfb0c9fd8246db4c7e1c9b766c82ad88054..53e48eb112c362baad9f3dba3ded5bf647f39a74 100644
(file)
--- a/
tools/lib/traceevent/parse-filter.c
+++ b/
tools/lib/traceevent/parse-filter.c
@@
-362,8
+362,11
@@
create_arg_item(struct event_format *event, const char *token,
arg->value.type =
type == EVENT_DQUOTE ? FILTER_STRING : FILTER_CHAR;
arg->value.str = strdup(token);
- if (!arg->value.str)
- die("malloc string");
+ if (!arg->value.str) {
+ free_arg(arg);
+ show_error(error_str, "failed to allocate string filter arg");
+ return NULL;
+ }
break;
case EVENT_ITEM:
/* if it is a number, then convert it */