Re: [RFC PATCH v3 09/14] perf metricgroup: free metric_events on error

Arnaldo Carvalho de Melo
2020-05-21T17:07:10Z

Em Thu, May 07, 2020 at 10:36:24PM -0700, Ian Rogers escreveu:
> Avoid a simple memory leak.

Thanks, applied.

- Arnaldo

> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/metricgroup.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 4f7e36bc49d9..7e1725d61c39 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -186,6 +186,7 @@ static int metricgroup__setup_events(struct list_head *groups,
> if (!evsel) {
> pr_debug("Cannot resolve %s: %s\n",
> eg->metric_name, eg->metric_expr);
> + free(metric_events);
> continue;
> }
> for (i = 0; metric_events[i]; i++)
> @@ -193,11 +194,13 @@ static int metricgroup__setup_events(struct list_head *groups,
> me = metricgroup__lookup(metric_events_list, evsel, true);
> if (!me) {
> ret = -ENOMEM;
> + free(metric_events);
> break;
> }
> expr = malloc(sizeof(struct metric_expr));
> if (!expr) {
> ret = -ENOMEM;
> + free(metric_events);
> break;
> }
> expr->metric_expr = eg->metric_expr;
> --
> 2.26.2.645.ge9eca65c58-goog
>

--

- Arnaldo