Commit e678fefa authored Mar 05, 2015 by Ingo Molnar

Merge tag 'perf-urgent-for-mingo' of...

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 " - Fix SEGFAULT when freeing unparsed lock prefixed instructions in 'perf
     annotate' (Arnaldo Carvalho de Melo)"

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 6587457b 3995614d

tools/perf/util/annotate.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ static int disasm_line__parse(char line, char namep, char *rawp);

		static void ins__delete(struct ins_operands *ops)
		{
		if (ops == NULL)
		return;
		zfree(&ops->source.raw);
		zfree(&ops->source.name);
		zfree(&ops->target.raw);