Commit e0560ba6 authored Feb 04, 2020 by Ravi Bangoria Committed by Arnaldo Carvalho de Melo Feb 27, 2020

perf annotate: Fix segfault with source toggle



While rendering annotate browser from perf report tui, we keep track
of total number of lines(asm + source) in annotation->nr_entries and
total number of asm lines in annotation->nr_asm_entries. But we don't
reset them before starting. Thus if user annotates same function
multiple times, we restart incrementing these fields with old values.

This causes a segfault when user tries to toggle source code after
annotating same function multiple times. Fix it.

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Link: http://lore.kernel.org/lkml/20200204045233.474937-5-ravi.bangoria@linux.ibm.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent d3c03147

tools/perf/util/annotate.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2621,6 +2621,8 @@ void annotation__set_offsets(struct annotation *notes, s64 size)
		struct annotation_line *al;

		notes->max_line_len = 0;
		notes->nr_entries = 0;
		notes->nr_asm_entries = 0;

		list_for_each_entry(al, &notes->src->source, node) {
		size_t line_len = strlen(al->line);

Admin message