Messages in this thread Patch in this message | | | Date | Tue, 14 Jan 2014 08:37:38 -0800 | From | tip-bot for Arnaldo Carvalho de Melo <> | Subject | [tip:perf/core] perf tests: Fixup leak on error path in parse events test |
| |
Commit-ID: 2d4352c077b98215771cc081626c7a69289c4fac Gitweb: http://git.kernel.org/tip/2d4352c077b98215771cc081626c7a69289c4fac Author: Arnaldo Carvalho de Melo <acme@redhat.com> AuthorDate: Fri, 3 Jan 2014 17:30:04 -0300 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Mon, 13 Jan 2014 10:06:22 -0300
perf tests: Fixup leak on error path in parse events test
We need to call the evlist destructor when failing to parse events.
Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-ilslu69s7v7bpvdgqtrlp8f5@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/tests/parse-events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index e4ce8ae..41dee5e 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1385,10 +1385,10 @@ static int test_event(struct evlist_test *e) if (ret) { pr_debug("failed to parse event '%s', err %d\n", e->name, ret); - return ret; + } else { + ret = e->check(evlist); } - - ret = e->check(evlist); + perf_evlist__delete(evlist); return ret;
| |