diff options
| author | Rabin Vincent <rabin@rab.in> | 2015-01-18 20:00:21 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-01-21 10:05:32 -0300 |
| commit | 0fb9f2aab738eec9dd9b929ed7d37bf744d2ac77 (patch) | |
| tree | 04dd87c012dca644ecd7308a05b73349e3a5ec82 | |
| parent | be81908c2289f405df75d2511ccf5da785945400 (diff) | |
| download | linux-0fb9f2aab738eec9dd9b929ed7d37bf744d2ac77.tar.gz linux-0fb9f2aab738eec9dd9b929ed7d37bf744d2ac77.tar.bz2 linux-0fb9f2aab738eec9dd9b929ed7d37bf744d2ac77.zip | |
perf annotate: Fix memory leaks in LOCK handling
The lock prefix handling fails to free the strdup()'d name as well as
the fields allocated by the instruction parsing.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Cc: Paul Mackerras <paulus@samba.org>
Link: http://lkml.kernel.org/r/1421607621-15005-2-git-send-email-rabin@rab.in
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/util/annotate.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index d5da1b85541b..01bc4e23a2cf 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -177,6 +177,8 @@ static int lock__parse(struct ins_operands *ops) goto out_free_ops; ops->locked.ins = ins__find(name); + free(name); + if (ops->locked.ins == NULL) goto out_free_ops; @@ -209,6 +211,13 @@ static int lock__scnprintf(struct ins *ins, char *bf, size_t size, static void lock__delete(struct ins_operands *ops) { + struct ins *ins = ops->locked.ins; + + if (ins && ins->ops->free) + ins->ops->free(ops->locked.ops); + else + ins__delete(ops->locked.ops); + zfree(&ops->locked.ops); zfree(&ops->target.raw); zfree(&ops->target.name); |