From a38669ccbb9a16689db358c29cfd2c1066cf23d9 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 1 Oct 2012 20:13:51 -0400
Subject: [PATCH] --- yaml --- r: 334657 b: refs/heads/master c:
 101782ea2c6984cf169631c59df76b8497899caf h: refs/heads/master i:   334655:
 a83bdecfaae1ff40eabceb255ad7d36844d96758 v: v3

---
 [refs]                                   | 2 +-
 trunk/tools/lib/traceevent/event-parse.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d8c34a36fcf4..ceece03d15d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63a1a3d820c619a4dab1781cc16c110a284efded
+refs/heads/master: 101782ea2c6984cf169631c59df76b8497899caf
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 47264b4652b9..f2989c525e48 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -2602,6 +2602,9 @@ find_func_handler(struct pevent *pevent, char *func_name)
 {
 	struct pevent_function_handler *func;
 
+	if (!pevent)
+		return NULL;
+
 	for (func = pevent->func_handlers; func; func = func->next) {
 		if (strcmp(func->name, func_name) == 0)
 			break;
@@ -4938,6 +4941,9 @@ enum pevent_errno __pevent_parse_format(struct event_format **eventp,
 		goto event_alloc_failed;
 	}
 
+	/* Add pevent to event so that it can be referenced */
+	event->pevent = pevent;
+
 	ret = event_read_format(event);
 	if (ret < 0) {
 		ret = PEVENT_ERRNO__READ_FORMAT_FAILED;
@@ -5041,9 +5047,6 @@ enum pevent_errno pevent_parse_event(struct pevent *pevent, const char *buf,
 	if (event == NULL)
 		return ret;
 
-	/* Add pevent to event so that it can be referenced */
-	event->pevent = pevent;
-
 	if (add_event(pevent, event)) {
 		ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;
 		goto event_add_failed;