From 135c85133a32517875ef4ed563ef8dd97bc9c0e6 Mon Sep 17 00:00:00 2001
From: Warren Paul <warren.paul@nokia.com>
Date: Fri, 19 Feb 2010 16:40:26 +0000
Subject: [PATCH] fixed NPE.

---
 .../internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java
index a2853192d72..7751e433401 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java
@@ -58,7 +58,7 @@ public class CDIDisassemblyRetrieval implements IDisassemblyRetrieval {
 					}
 					else if (startAddress != null) {
 						mixedInstructions= cdiTarget.getMixedInstructions(startAddress, endAddress);
-						if (mixedInstructions.length == 0) {
+						if (mixedInstructions == null || mixedInstructions.length == 0) {
 							mixedInstructions= null;
 							asmInstructions= cdiTarget.getInstructions(startAddress, endAddress);
 						} else if (mixedInstructions.length == 1 && mixedInstructions[0].getInstructions().length == 0) {