[PATCH v7 14/14] perf trace: Fix evlist memory leak

[Ian Rogers]

Leak sanitizer was reporting a memory leak in the "perf record and
replay" test. Add evlist__delete to trace__exit, also ensure
trace__exit is called after trace__record.

Signed-off-by: Ian Rogers <irog...@google.com>
---
 tools/perf/builtin-trace.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 1d4ad5d19b10..a102748bd0c9 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -5339,6 +5339,8 @@ static void trace__exit(struct trace *trace)
                zfree(&trace->syscalls.table);
        }
        zfree(&trace->perfconfig_events);
+       evlist__delete(trace->evlist);
+       trace->evlist = NULL;
 #ifdef HAVE_LIBBPF_SUPPORT
        btf__free(trace->btf);
        trace->btf = NULL;
@@ -5719,8 +5721,10 @@ int cmd_trace(int argc, const char **argv)
                }
        }
 
-       if ((argc >= 1) && (strcmp(argv[0], "record") == 0))
-               return trace__record(&trace, argc-1, &argv[1]);
+       if ((argc >= 1) && (strcmp(argv[0], "record") == 0)) {
+               err = trace__record(&trace, argc-1, &argv[1]);
+               goto out;
+       }
 
        /* Using just --errno-summary will trigger --summary */
        if (trace.errno_summary && !trace.summary && !trace.summary_only)
-- 
2.49.0.rc1.451.g8f38331e32-goog