mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-12 18:55:38 +02:00
Code Issues Wiki Activity

Bug 317226: Disassembly view throws NPE when debugging with CDI. Fix also NPE when getting frame address

Browse source
This commit is contained in:
Teodor Madan 2010-06-18 16:11:44 +00:00
parent 931bdcb29a
commit bb9485981f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java
View file

@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.disassembly.dsf;
import java.math.BigInteger; import java.math.BigInteger;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction; import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;
@ -99,7 +100,12 @@ public class CDIDisassemblyRetrieval implements IDisassemblyRetrieval {
Runnable op= new Runnable() { Runnable op= new Runnable() {
public void run() { public void run() {
if (stackFrame instanceof ICStackFrame) { if (stackFrame instanceof ICStackFrame) {
addressRequest.setAddress(((ICStackFrame)stackFrame).getAddress().getValue()); IAddress address = ((ICStackFrame)stackFrame).getAddress();
if (address != null ) {
addressRequest.setAddress(address.getValue());
} else {
addressRequest.setStatus(new Status(IStatus.ERROR, CDebugUIPlugin.getUniqueIdentifier(), "Internal error: Cannot retrieve frame address")); //$NON-NLS-1$
}
} else { } else {
addressRequest.cancel(); addressRequest.cancel();
} }