From b2f17f8a3daf0e858980b8887ae8532c35e7b10e Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 25 Apr 2012 07:48:42 -0300
Subject: [PATCH] --- yaml --- r: 304854 b: refs/heads/master c:
 9481ede909e08418c9379665ee9f25335d20dd06 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/tools/perf/ui/browsers/annotate.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 223fc78f5dd9..c99399f70274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3f895be1f1ed17f66e6e71adeef0cc7f937512c
+refs/heads/master: 9481ede909e08418c9379665ee9f25335d20dd06
diff --git a/trunk/tools/perf/ui/browsers/annotate.c b/trunk/tools/perf/ui/browsers/annotate.c
index 9e3310cd02cd..4c83fe3d7dad 100644
--- a/trunk/tools/perf/ui/browsers/annotate.c
+++ b/trunk/tools/perf/ui/browsers/annotate.c
@@ -700,6 +700,13 @@ static void annotate_browser__mark_jump_targets(struct annotate_browser *browser
 		}
 
 		dlt = browser->offsets[dl->ops.target];
+		/*
+ 		 * FIXME: Oops, no jump target? Buggy disassembler? Or do we
+ 		 * have to adjust to the previous offset?
+ 		 */
+		if (dlt == NULL)
+			continue;
+
 		bdlt = disasm_line__browser(dlt);
 		bdlt->jump_target = true;
 	}