2 files changed, 21 insertions, 3 deletions

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 47264b4652b9..f2989c525e48 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/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;
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index ad17855528f9..5ea4326ad11f 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -209,7 +209,16 @@ static void free_arg(struct filter_arg *arg)
         switch (arg->type) {
         case FILTER_ARG_NONE:
         case FILTER_ARG_BOOLEAN:
+                break;
+
         case FILTER_ARG_NUM:
+                free_arg(arg->num.left);
+                free_arg(arg->num.right);
+                break;
+
+        case FILTER_ARG_EXP:
+                free_arg(arg->exp.left);
+                free_arg(arg->exp.right);
                 break;
 
         case FILTER_ARG_STR:
@@ -218,6 +227,12 @@ static void free_arg(struct filter_arg *arg)
                 free(arg->str.buffer);
                 break;
 
+        case FILTER_ARG_VALUE:
+                if (arg->value.type == FILTER_STRING ||
+                    arg->value.type == FILTER_CHAR)
+                        free(arg->value.str);
+                break;
+
         case FILTER_ARG_OP:
                 free_arg(arg->op.left);
                 free_arg(arg->op.right);