Re: [PATCH v2 3/3] perf metric: Fix memory leaks.
From: Arnaldo Carvalho de Melo <acme@kernel.org>
Date: 2021-11-07 15:41:34
Also in:
lkml
Em Sun, Nov 07, 2021 at 01:00:02AM -0800, Ian Rogers escreveu:
Certain error paths may leak memory as caught by address sanitizer. Ensure this is cleaned up to make sure address/leak sanitizer is happy.
Thanks, applied. - Arnaldo
quoted hunk ↗ jump to hunk
Fixes: 5ecd5a0c7d1c ("perf metrics: Modify setup and deduplication") Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/util/metricgroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 1b43cbc1961d..fffe02aae3ed 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c@@ -228,6 +228,7 @@ static void metric__free(struct metric *m) free(m->metric_refs); expr__ctx_free(m->pctx); free((char *)m->modifier); + evlist__delete(m->evlist); free(m); }@@ -1482,8 +1483,10 @@ static int parse_groups(struct evlist *perf_evlist, const char *str, } - if (combined_evlist) + if (combined_evlist) { evlist__splice_list_tail(perf_evlist, &combined_evlist->core.entries); + evlist__delete(combined_evlist); + } list_for_each_entry(m, &metric_list, nd) { if (m->evlist)-- 2.34.0.rc0.344.g81b53c2807-goog
-- - Arnaldo