From f559b2402e79433a7d98861be0eb66978df51d59 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Wed, 23 May 2012 11:36:49 +0900
Subject: [PATCH] --- yaml --- r: 309412 b: refs/heads/master c:
 d1de10870909a27ce2ac380d0671feb308826491 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 90837d50d4f7..06731a6d1cda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57d34dc5568f6ac700ef7e5c67f2bd6a8c7c4659
+refs/heads/master: d1de10870909a27ce2ac380d0671feb308826491
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index d598b376e3c1..445a43ad42fd 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -1715,6 +1715,8 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
 
 		if (set_op_prio(arg) == -1) {
 			event->flags |= EVENT_FL_FAILED;
+			/* arg->op.op (= token) will be freed at out_free */
+			arg->op.op = NULL;
 			goto out_free;
 		}