From 4d047a6eb3046da65ee190338af09032f378a90a Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Tue, 14 Aug 2012 10:57:03 +0900
Subject: [PATCH] --- yaml --- r: 323689 b: refs/heads/master c:
 d0d3913895e5b50623bd4dafd876e41c1169031d h: refs/heads/master i:   323687:
 e29f6df58f50e529d95df15a04de8d3612937da0 v: v3

---
 [refs]                                    | 2 +-
 trunk/tools/perf/util/trace-event-parse.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 476889d3a889..56562f59bbeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fe7d7e9761ec7e23350b5543ddac470bb3cde1e
+refs/heads/master: d0d3913895e5b50623bd4dafd876e41c1169031d
diff --git a/trunk/tools/perf/util/trace-event-parse.c b/trunk/tools/perf/util/trace-event-parse.c
index 4cb7f3831f78..a5a554efeb50 100644
--- a/trunk/tools/perf/util/trace-event-parse.c
+++ b/trunk/tools/perf/util/trace-event-parse.c
@@ -293,7 +293,7 @@ struct event_format *trace_find_next_event(struct pevent *pevent,
 {
 	static int idx;
 
-	if (!pevent->events)
+	if (!pevent || !pevent->events)
 		return NULL;
 
 	if (!event) {