[PATCH 11/14] tools lib traceevent: Get rid of malloc_or_die() in pevent_filter_add_filter_str()

[Namhyung Kim]

Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
 tools/lib/traceevent/parse-filter.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/parse-filter.c 
b/tools/lib/traceevent/parse-filter.c
index dabae52bbbcb..d8613308c08d 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1319,7 +1319,13 @@ int pevent_filter_add_filter_str(struct event_filter 
*filter,
                else
                        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);
                this_event[len] = 0;
 
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/