diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:46:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:46:03 -0400 |
| commit | 072e5a1cfabca7276744d24726e094d85721df5c (patch) | |
| tree | c7237fa143f72273aa8a8179f741c24b9072001c /tools/perf/util/annotate.c | |
| parent | 294fe0f52a44c6f207211de0686c369a961b5533 (diff) | |
| parent | d525211f9d1be8b523ec7633f080f2116f5ea536 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index b72086eca943..7f5bdfc9bc87 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); | |||
| 30 | 30 | ||
| 31 | static void ins__delete(struct ins_operands *ops) | 31 | static void ins__delete(struct ins_operands *ops) |
| 32 | { | 32 | { |
| 33 | if (ops == NULL) | ||
| 34 | return; | ||
| 33 | zfree(&ops->source.raw); | 35 | zfree(&ops->source.raw); |
| 34 | zfree(&ops->source.name); | 36 | zfree(&ops->source.name); |
| 35 | zfree(&ops->target.raw); | 37 | zfree(&ops->target.raw); |