mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Frederik Deweerdt <frederik.deweerdt@xprog.eu>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org,
	frederik.deweerdt@xprog.eu, hpa@zytor.com, mingo@redhat.com,
	tglx@linutronix.de
Subject: [tip:perf/core] perf ui hist browser: Fix segfault on 'a' for annotate
Date: Tue, 5 Oct 2010 12:13:24 GMT	[thread overview]
Message-ID: <tip-c569d3326bca6774f6c23f1dc91acad5400b6409@git.kernel.org> (raw)
In-Reply-To: <20100923201901.GE31726@gambetta>

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;

      parent reply	other threads:[~2010-10-05 12:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-23 20:19 [patch 36-rc5] perf browser ui " Frederik Deweerdt
2010-10-04 17:56 ` Arnaldo Carvalho de Melo
2010-10-05 12:13 ` tip-bot for Frederik Deweerdt [this message]

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=tip-c569d3326bca6774f6c23f1dc91acad5400b6409@git.kernel.org \
    --to=frederik.deweerdt@xprog.eu \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /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®