Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d1e1b1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf report: Fix leak of resolved callchains array on error path 



Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 139633c6

tools/perf/builtin-report.c

+7 −9
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int perf_session__add_hist_entry(struct perf_session *self, 
	struct map_symbol *syms = NULL;

	struct symbol *parent = NULL;

	bool hit;

	int err;

	int err = -ENOMEM;

	struct hist_entry *he;

	struct event_stat_id *stats;

	struct perf_event_attr *attr;
@@ -101,28 +101,26 @@ static int perf_session__add_hist_entry(struct perf_session *self, 
	else

		stats = get_stats(self, data->id, 0, 0);

	if (stats == NULL)

		return -ENOMEM;

		goto out_free_syms;

	he = __perf_session__add_hist_entry(&stats->hists, al, parent,

					    data->period, &hit);

	if (he == NULL)

		return -ENOMEM;

		goto out_free_syms;



	if (hit)

		__perf_session__add_count(he, al,  data->period);



	err = 0;

	if (symbol_conf.use_callchain) {

		if (!hit)

			callchain_init(he->callchain);

		err = append_chain(he->callchain, data->callchain, syms);

	}

out_free_syms:

	free(syms);



		if (err)

	return err;

}



	return 0;

}



static int add_event_total(struct perf_session *session,

			   struct sample_data *data,

			   struct perf_event_attr *attr)