[patch 36-rc5] perf browser ui segfault on 'a' for annotate

[patch 36-rc5] perf browser ui segfault on 'a' for annotate

[Frederik Deweerdt]

Hi Arnaldo,

There a typo in util/ui/browsers/hists.c that leads to a segfault when
you press the 'a' key on a non-resolved symbol (plain hex address).

This is fixed by the patch below.

Thanks,
Frederik

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xprog.eu>

diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index dafdf67..6866aa4 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -773,7 +773,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name)
 
 			switch (key) {
 			case 'a':
-				if (browser->selection->map == NULL &&
+				if (browser->selection->map == NULL ||
 				    browser->selection->map->dso->annotate_warned)
 					continue;
 				goto do_annotate;

Re: [patch 36-rc5] perf browser ui segfault on 'a' for annotate

[Arnaldo Carvalho de Melo]

Em Thu, Sep 23, 2010 at 10:19:01PM +0200, Frederik Deweerdt escreveu:
> Hi Arnaldo,
> 
> There a typo in util/ui/browsers/hists.c that leads to a segfault when
> you press the 'a' key on a non-resolved symbol (plain hex address).
> 
> This is fixed by the patch below.

Thanks, applied!

- Arnaldo

[tip:perf/core] perf ui hist browser: Fix segfault on 'a' for annotate

[tip-bot for Frederik Deweerdt]

Commit-ID:  c569d3326bca6774f6c23f1dc91acad5400b6409
Gitweb:     http://git.kernel.org/tip/c569d3326bca6774f6c23f1dc91acad5400b6409
Author:     Frederik Deweerdt <frederik.deweerdt@xprog.eu>
AuthorDate: Thu, 23 Sep 2010 22:19:01 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 4 Oct 2010 12:08:37 -0300

perf ui hist browser: Fix segfault on 'a' for annotate

There a typo in util/ui/browsers/hists.c that leads to a segfault when you
press the 'a' key on a non-resolved symbol (plain hex address).

LKML-Reference: <20100923201901.GE31726@gambetta>
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xprog.eu>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/ui/browsers/hists.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index dafdf67..6866aa4 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -773,7 +773,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name)
 
 			switch (key) {
 			case 'a':
-				if (browser->selection->map == NULL &&
+				if (browser->selection->map == NULL ||
 				    browser->selection->map->dso->annotate_warned)
 					continue;
 				goto do_annotate;