diff options
author | Ian Rogers <irogers@google.com> | 2021-11-07 10:00:01 +0100 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-11-07 19:39:25 +0100 |
commit | 07eafd4e053a41d72611848b8758df0752b53ee4 (patch) | |
tree | 49140217f326f358935eaa4bcc6b15cd108139c3 /tools/perf/tests/expand-cgroup.c | |
parent | perf parse-events: Rename parse_events_error functions (diff) | |
download | linux-07eafd4e053a41d72611848b8758df0752b53ee4.tar.xz linux-07eafd4e053a41d72611848b8758df0752b53ee4.zip |
perf parse-event: Add init and exit to parse_event_error
parse_events() may succeed but leave string memory allocations reachable
in the error.
Add an init/exit that must be called to initialize and clean up the
error. This fixes a leak in metricgroup parse_ids.
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20211107090002.3784612-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/expand-cgroup.c')
-rw-r--r-- | tools/perf/tests/expand-cgroup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgroup.c index 57b4c5f30324..80cff8a3558c 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -124,6 +124,7 @@ static int expand_group_events(void) evlist = evlist__new(); TEST_ASSERT_VAL("failed to get evlist", evlist); + parse_events_error__init(&err); ret = parse_events(evlist, event_str, &err); if (ret < 0) { pr_debug("failed to parse event '%s', err %d, str '%s'\n", @@ -135,6 +136,7 @@ static int expand_group_events(void) rblist__init(&metric_events); ret = test_expand_events(evlist, &metric_events); out: + parse_events_error__exit(&err); evlist__delete(evlist); return ret; } |