From: David Ahern <dsahern@gmail.com>
To: acme@ghostprotocols.net, linux-kernel@vger.kernel.org
Cc: mingo@elte.hu, peterz@infradead.org, fweisbec@gmail.com,
David Ahern <dsahern@gmail.com>
Subject: [PATCH] perf top: fix crash on annotate request
Date: Wed, 19 Oct 2011 12:23:18 -0600 [thread overview]
Message-ID: <1319048598-15030-1-git-send-email-dsahern@gmail.com> (raw)
Hitting an annotate case where src is not set and
perf-top crashes.
Signed-off-by: David Ahern <dsahern@gmail.com>
---
tools/perf/util/annotate.c | 3 +++
tools/perf/util/ui/browsers/annotate.c | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index bc8f477..26652b1 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -205,6 +205,9 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
size_t line_len;
s64 line_ip, offset = -1;
+ if (!notes->src)
+ return -1;
+
if (getline(&line, &line_len, file) < 0)
return -1;
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index a2c351c..5a67ead 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -410,6 +410,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
ui_helpline__push("Press <- or ESC to exit");
notes = symbol__annotation(sym);
+ if (!notes->src)
+ return -1;
list_for_each_entry(pos, ¬es->src->source, node) {
struct objdump_line_rb_node *rbpos;
--
1.7.6.4
next reply other threads:[~2011-10-19 18:23 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 18:23 David Ahern [this message]
2011-10-19 18:38 ` [PATCH] perf top: fix crash on annotate request Arnaldo Carvalho de Melo
2011-10-19 18:44 ` David Ahern
2011-10-19 19:20 ` Arnaldo Carvalho de Melo
2011-10-19 20:21 ` David Ahern
2011-10-19 21:39 ` David Ahern
2011-10-20 12:51 ` Arnaldo Carvalho de Melo
2011-10-19 22:12 ` David Ahern
2011-10-20 13:00 ` Arnaldo Carvalho de Melo
2011-10-20 14:15 ` David Ahern
2011-11-10 22:01 ` Brian Marete
2011-11-13 13:43 ` Arnaldo Carvalho de Melo
2011-11-13 21:03 ` Brian Marete
2011-11-13 21:42 ` Brian Marete
2011-11-30 13:23 ` Brian Marete
2011-11-30 18:10 ` Arnaldo Carvalho de Melo
2011-12-01 13:17 ` Brian Marete
2011-12-01 14:11 ` Arnaldo Carvalho de Melo
2011-12-06 7:22 ` Brian Gitonga Marete
2011-12-06 13:44 ` Arnaldo Carvalho de Melo
2011-12-15 21:01 ` Brian Gitonga Marete
2011-12-15 22:04 ` Brian Gitonga Marete
2011-12-16 23:46 ` Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2011-10-20 20:39 David Ahern
2011-10-20 21:30 ` Arnaldo Carvalho de Melo
2011-10-20 23:26 ` Arnaldo Carvalho de Melo
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=1319048598-15030-1-git-send-email-dsahern@gmail.com \
--to=dsahern@gmail.com \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).