mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
To: acme@kernel.org, jolsa@redhat.com
Cc: namhyung@kernel.org, irogers@google.com, songliubraving@fb.com,
	yao.jin@linux.intel.com, linux-kernel@vger.kernel.org,
	Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Subject: [PATCH v2 4/6] perf annotate: Fix segfault with source toggle
Date: Fri, 24 Jan 2020 13:34:30 +0530	[thread overview]
Message-ID: <20200124080432.8065-5-ravi.bangoria@linux.ibm.com> (raw)
In-Reply-To: <20200124080432.8065-1-ravi.bangoria@linux.ibm.com>

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>
Acked-by: Jiri Olsa <jolsa@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 d4a130d5913a..58e2c51e9d62 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2616,6 +2616,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);
-- 
2.24.1


  parent reply	other threads:[~2020-01-24  8:05 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-24  8:04 [PATCH v2 0/6] perf annotate: Misc fixes / improvements Ravi Bangoria
2020-01-24  8:04 ` [PATCH v2 1/6] perf annotate: Remove privsize from symbol__annotate() args Ravi Bangoria
2020-01-30 11:16   ` Arnaldo Carvalho de Melo
2020-02-03  4:54     ` Ravi Bangoria
2020-02-03 13:30       ` Jiri Olsa
2020-02-04  2:37         ` Ravi Bangoria
2020-01-24  8:04 ` [PATCH v2 2/6] perf annotate: Simplify disasm_line allocation and freeing code Ravi Bangoria
2020-01-27 11:59   ` Jiri Olsa
2020-01-28 13:57     ` Ravi Bangoria
2020-01-24  8:04 ` [PATCH v2 3/6] perf annotate: Align struct annotate_args Ravi Bangoria
2020-01-24  8:04 ` Ravi Bangoria [this message]
2020-01-24  8:04 ` [PATCH v2 5/6] perf annotate: Make few functions static Ravi Bangoria
2020-01-24  8:04 ` [PATCH v2 6/6] perf annotate: Get rid of annotation->nr_jumps Ravi Bangoria

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200124080432.8065-5-ravi.bangoria@linux.ibm.com \
    --to=ravi.bangoria@linux.ibm.com \
    --cc=acme@kernel.org \
    --cc=irogers@google.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=namhyung@kernel.org \
    --cc=songliubraving@fb.com \
    --cc=yao.jin@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®