Commit b2c34fde authored Jul 04, 2013 by Adrian Hunter Committed by Arnaldo Carvalho de Melo Jul 08, 2013

perf tools: Fix parse_events_terms() segfault on error path



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>

parent 7cab84e8

tools/perf/util/parse-events.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -860,6 +860,7 @@ int parse_events_terms(struct list_head terms, const char str)
		return 0;
		}

		if (data.terms)
		parse_events__free_terms(data.terms);
		return ret;
		}