Commit 28942c87 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Get rid of malloc_or_die() in pevent_filter_add_filter_str()

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarSteven 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-12-git-send-email-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2036fcd1
...@@ -1226,7 +1226,13 @@ int pevent_filter_add_filter_str(struct event_filter *filter, ...@@ -1226,7 +1226,13 @@ int pevent_filter_add_filter_str(struct event_filter *filter,
else else
len = strlen(filter_str); len = strlen(filter_str);
this_event = malloc_or_die(len + 1); this_event = malloc(len + 1);
if (this_event == NULL) {
show_error(error_str, "Memory allocation failure");
/* This can only happen when events is NULL, but still */
free_events(events);
return -1;
}
memcpy(this_event, filter_str, len); memcpy(this_event, filter_str, len);
this_event[len] = 0; this_event[len] = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment