perf tools: Fix parse_events_terms() segfault on error path
authorAdrian Hunter <adrian.hunter@intel.com>
Thu, 4 Jul 2013 13:20:23 +0000 (16:20 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 8 Jul 2013 20:45:41 +0000 (17:45 -0300)
On the error path, 'data.terms' may not have been initialised.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1372944040-32690-5-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/parse-events.c

index 6c8bb0fb189bab72966b65269023d0604653db90..d8dcb8dbb1e2eb5feb41820d2d6972af35f8745c 100644 (file)
@@ -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;
 }