Messages in this thread Patch in this message | | | Date | Sat, 29 Feb 2020 09:16:46 -0000 | From | "tip-bot2 for Ravi Bangoria" <> | Subject | [tip: perf/urgent] perf annotate: Fix segfault with source toggle |
| |
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: e0560ba6d92f06dbe13e9d11c921a60c07ea6fcc Gitweb: https://git.kernel.org/tip/e0560ba6d92f06dbe13e9d11c921a60c07ea6fcc Author: Ravi Bangoria <ravi.bangoria@linux.ibm.com> AuthorDate: Tue, 04 Feb 2020 10:22:31 +05:30 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Thu, 27 Feb 2020 11:47:23 -03:00
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> --- tools/perf/util/annotate.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index c816e58..0ea95be 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -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, ¬es->src->source, node) { size_t line_len = strlen(al->line);
| |