Merge remote-tracking branch 'linus/master' into testing

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6c8bb0fb189b..995fc25db8c6 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -860,7 +860,8 @@ int parse_events_terms(struct list_head *terms, const char *str)
                 return 0;
         }
 
-        parse_events__free_terms(data.terms);
+        if (data.terms)
+                parse_events__free_terms(data.terms);
         return ret;
 }
 
@@ -1183,6 +1184,7 @@ static int new_term(struct parse_events_term **_term, int type_val,
                 term->val.str = str;
                 break;
         default:
+                free(term);
                 return -EINVAL;
         }