mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

Bug 327716 - [disassembly] NPE in BreakpointsAnnotationModel

Browse source
This commit is contained in:
Anton Leherbauer 2010-10-14 09:37:05 +00:00
parent b99efd0422
commit 918eb1278a
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
View file

@ -9,7 +9,6 @@
* Anton Leherbauer (Wind River Systems) - initial API and implementation * Anton Leherbauer (Wind River Systems) - initial API and implementation
* Patrick Chuong (Texas Instruments) - bug 300053 * Patrick Chuong (Texas Instruments) - bug 300053
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.dsf.debug.internal.ui.disassembly.model; package org.eclipse.cdt.dsf.debug.internal.ui.disassembly.model;
import java.math.BigInteger; import java.math.BigInteger;
@ -152,7 +151,7 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
IBreakpointLocationProvider locationProvider = (IBreakpointLocationProvider) breakpoint.getAdapter(IBreakpointLocationProvider.class); IBreakpointLocationProvider locationProvider = (IBreakpointLocationProvider) breakpoint.getAdapter(IBreakpointLocationProvider.class);
/* if there is a location provider, than use the provider to retrieve the location */ /* if there is a location provider, than use the provider to retrieve the location */
if (locationProvider != null) { if (locationProvider != null) {
/* if there is source info, than create a source line position */ /* if there is source info, than create a source line position */
String sourceFile = locationProvider.getSourceFile(breakpoint); String sourceFile = locationProvider.getSourceFile(breakpoint);
@ -167,7 +166,7 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
return createPositionFromLabel(labelAddress.getValue()); return createPositionFromLabel(labelAddress.getValue());
/* Otherwise, create an address position */ /* Otherwise, create an address position */
} else { } else {
// Discussion with Anton - comment #5 (Bug 300053) // Discussion with Anton - comment #5 (Bug 300053)
// //
@ -206,9 +205,7 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
} }
} else { } else {
String fileName= marker.getAttribute(ICLineBreakpoint.SOURCE_HANDLE, null); String fileName= marker.getAttribute(ICLineBreakpoint.SOURCE_HANDLE, null);
if (fileName != null) { position= createPositionFromSourceLine(fileName, lineNumber);
position= createPositionFromSourceLine(fileName, lineNumber);
}
} }
return position; return position;
} }
@ -218,7 +215,10 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
} }
private Position createPositionFromSourceLine(String fileName, int lineNumber) { private Position createPositionFromSourceLine(String fileName, int lineNumber) {
return getDisassemblyDocument().getSourcePosition(fileName, lineNumber); if (fileName != null) {
return getDisassemblyDocument().getSourcePosition(fileName, lineNumber);
}
return null;
} }
private Position createPositionFromSourceLine(IFile file, int lineNumber) { private Position createPositionFromSourceLine(IFile file, int lineNumber) {
@ -258,15 +258,17 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
* @return address value as <code>BigInteger</code> or <code>null</code> in case of a <code>NumberFormatException</code> * @return address value as <code>BigInteger</code> or <code>null</code> in case of a <code>NumberFormatException</code>
*/ */
private static BigInteger decodeAddress(String string) { private static BigInteger decodeAddress(String string) {
try { if (string != null) {
if (string.startsWith("0x")) { //$NON-NLS-1$ try {
return new BigInteger(string.substring(2), 16); if (string.startsWith("0x")) { //$NON-NLS-1$
return new BigInteger(string.substring(2), 16);
}
if (string.length() > 0) {
return new BigInteger(string);
}
} catch (NumberFormatException nfe) {
// don't propagate
} }
if (string.length() > 0) {
return new BigInteger(string);
}
} catch (NumberFormatException nfe) {
// don't propagate
} }
return null; return null;
} }