projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6587457
)
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Ingo Molnar
<mingo@kernel.org>
Thu, 5 Mar 2015 19:32:43 +0000
(20:32 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 5 Mar 2015 19:32:43 +0000
(20:32 +0100)
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>
tools/perf/util/annotate.c
patch
|
blob
|
blame
|
history
diff --git
a/tools/perf/util/annotate.c
b/tools/perf/util/annotate.c
index 61bf9128e1f28ce40d3d694ef5d9de8bb9cda1f8..9d9db3b296dd6b50ed27e581c0d78aab65dfec49 100644
(file)
--- 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);