aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Olsa <[email protected]>2020-07-19 20:13:02 +0200
committerArnaldo Carvalho de Melo <[email protected]>2020-07-30 07:01:49 -0300
commit60e10c0037d0159f886c8592b761ee31ab3b7e21 (patch)
tree9015b9607cf8f4e6f002456bff042faf371f2fa2
parent1b98c6e3ba8be09a2f988dc4b80de9b4b029b93f (diff)
perf metric: Fix memory leak in expr__add_id function
Arnaldo found that we don't release value data in case the hashmap__set fails. Releasing it in case of an error. Reported-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> Acked-by: Ian Rogers <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Andi Kleen <[email protected]> Cc: John Garry <[email protected]> Cc: Kajol Jain <[email protected]> Cc: Michael Petlan <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Clarke <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/util/expr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
index 5d05f9765ed8..578a173d4873 100644
--- a/tools/perf/util/expr.c
+++ b/tools/perf/util/expr.c
@@ -47,6 +47,8 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)
}
ret = hashmap__set(&ctx->ids, id, data_ptr,
(const void **)&old_key, (void **)&old_data);
+ if (ret)
+ free(data_ptr);
free(old_key);
free(old_data);
return ret;