mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

[290880] add null-pointer check on frame.getAddress() return value (applied patch)

Browse source
This commit is contained in:
John Cortell 2009-09-30 09:34:33 +00:00
parent d9a409f830
commit b6cb68b56d
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyRetrieval.java
View file

@ -16,6 +16,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.IAddressFactory;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
@ -117,7 +118,8 @@ public class DisassemblyRetrieval extends CDebugElement implements ICDIEventList
if ( input instanceof ICStackFrame ) { if ( input instanceof ICStackFrame ) {
fInput = input; fInput = input;
ICStackFrame frame = (ICStackFrame)input; ICStackFrame frame = (ICStackFrame)input;
BigInteger address = frame.getAddress().getValue(); IAddress frameAddress = frame.getAddress();
BigInteger address = (frameAddress != null) ? frameAddress.getValue() : BigInteger.valueOf(0);
if ( !containsAddress( address, fLines ) ) { if ( !containsAddress( address, fLines ) ) {
fCurrentOffset = 0; fCurrentOffset = 0;
reset(); reset();
@ -135,7 +137,6 @@ public class DisassemblyRetrieval extends CDebugElement implements ICDIEventList
public void retrieveDisassembly( Object input, Object base, int offset, int lineCount, boolean reveal, int flags ) throws DebugException { public void retrieveDisassembly( Object input, Object base, int offset, int lineCount, boolean reveal, int flags ) throws DebugException {
fFlags = flags; fFlags = flags;
boolean showInstructions = ( (flags & FLAGS_SHOW_INSTRUCTIONS) != 0 );
boolean showSource = ( (flags & FLAGS_SHOW_SOURCE) != 0 ); boolean showSource = ( (flags & FLAGS_SHOW_SOURCE) != 0 );
List<IDisassemblyLine> lines = new ArrayList<IDisassemblyLine>( lineCount ); List<IDisassemblyLine> lines = new ArrayList<IDisassemblyLine>( lineCount );
BigInteger startAddress = getCurrentStartAddress(); BigInteger startAddress = getCurrentStartAddress();
@ -289,19 +290,6 @@ public class DisassemblyRetrieval extends CDebugElement implements ICDIEventList
return null; return null;
} }
private IDisassemblyInstruction getPreviousInstruction( BigInteger baseAddress ) throws DebugException {
BigInteger endAddress = baseAddress.add( BigInteger.valueOf( 1 ) );
BigInteger startAddress = baseAddress;
IDisassemblyLine[] lines = new IDisassemblyLine[0];
int index = -1;
while( index == -1 && startAddress.compareTo( getGlobalStartAddress() ) > 0 ) {
startAddress = startAddress.subtract( BigInteger.valueOf( 1 ) );
lines = disassemble( startAddress, endAddress, false );
index = getIndexForAddress( baseAddress, lines );
}
return ( index > 0 ) ? (IDisassemblyInstruction)lines[index - 1] : null;
}
private IDisassemblyInstruction getFirstInstruction( IDisassemblyLine[] lines ) { private IDisassemblyInstruction getFirstInstruction( IDisassemblyLine[] lines ) {
for ( IDisassemblyLine l : lines ) { for ( IDisassemblyLine l : lines ) {
if ( l instanceof IDisassemblyInstruction ) if ( l instanceof IDisassemblyInstruction )
@ -318,10 +306,6 @@ public class DisassemblyRetrieval extends CDebugElement implements ICDIEventList
return null; return null;
} }
private BigInteger getGlobalStartAddress() {
return getAddressFactory().getZero().getValue();
}
private BigInteger getGlobalEndAddress() { private BigInteger getGlobalEndAddress() {
return getAddressFactory().getMax().getValue(); return getAddressFactory().getMax().getValue();
} }