From a220519971ba39c852d140fefc61856642fd5afd Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Fri, 7 Sep 2012 11:49:46 +0900
Subject: [PATCH] --- yaml --- r: 323775 b: refs/heads/master c:
 0ca8da00ad170c12c12350c3a2500591a7bec535 h: refs/heads/master i:   323773:
 bd2093c94ee424da8b043d8bc5dea2fd2dd2237e   323771:
 6c46d5a353f08a2995e672a6d0d85d590e234561   323767:
 b76f5169c9b302878b92ac4640d2e87f0ad80b7c   323759:
 c5ba90abda9681fbb06654f06ffc25ed2ca48966   323743:
 3356d7f226cfb203139a5431e68bdada84d314f5   323711:
 2fe474357630908c5d6553c1a3ba57e0a50a0f48 v: v3

---
 [refs]                                   |  2 +-
 trunk/tools/lib/traceevent/event-parse.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bf61c118d717..665dddeeada2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 245c5a18433090da0e1a799bdb0faa78552b5992
+refs/heads/master: 0ca8da00ad170c12c12350c3a2500591a7bec535
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 6d5e75987a3d..17fd01d46e60 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -5183,7 +5183,12 @@ int pevent_register_event_handler(struct pevent *pevent,
 
  not_found:
 	/* Save for later use. */
-	handle = malloc_or_die(sizeof(*handle));
+	handle = malloc(sizeof(*handle));
+	if (!handle) {
+		do_warning("Failed to allocate event handler");
+		return PEVENT_ERRNO__MEM_ALLOC_FAILED;
+	}
+
 	memset(handle, 0, sizeof(*handle));
 	handle->id = id;
 	if (event_name)
@@ -5193,7 +5198,11 @@ int pevent_register_event_handler(struct pevent *pevent,
 
 	if ((event_name && !handle->event_name) ||
 	    (sys_name && !handle->sys_name)) {
-		die("Failed to allocate event/sys name");
+		do_warning("Failed to allocate event/sys name");
+		free((void *)handle->event_name);
+		free((void *)handle->sys_name);
+		free(handle);
+		return PEVENT_ERRNO__MEM_ALLOC_FAILED;
 	}
 
 	handle->func = func;