aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-03-05 20:32:43 +0100
committerIngo Molnar <mingo@kernel.org>2015-03-05 20:32:43 +0100
commite678fefa07f63c8f757d61b621fd1e5569cd63be (patch)
tree012340994ed8d7311ca59e4c18f75b25835152ba /tools
parentMerge tag 'dma-buf-for-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf (diff)
parentperf annotate: Fix fallback to unparsed disassembler line (diff)
downloadlinux-dev-e678fefa07f63c8f757d61b621fd1e5569cd63be.tar.xz
linux-dev-e678fefa07f63c8f757d61b621fd1e5569cd63be.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/annotate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 61bf9128e1f2..9d9db3b296dd 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -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);