Re: [PATCH 01/19] perf metric: Fix memory leak in expr__add_id function

Ian Rogers
2020-07-19T21:42:01Z

On Sun, Jul 19, 2020 at 11:13 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> 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 <acme@redhat.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Acked-by: Ian Rogers <irogers@google.com>

> ---
> tools/perf/util/expr.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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;
> --
> 2.25.4
>