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

Fix potential null pointer use

Browse source
This commit is contained in:
John Cortell 2010-09-02 16:44:02 +00:00
parent fff45080d0
commit 213901d450
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
View file

@ -416,7 +416,9 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
} catch (DebugException e1) { } catch (DebugException e1) {
fGotoAddressBar.handleExpressionStatus(new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID, fGotoAddressBar.handleExpressionStatus(new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID,
Messages.getString("MemoryBrowser.FailedToGoToAddressTitle"), e1)); //$NON-NLS-1$ Messages.getString("MemoryBrowser.FailedToGoToAddressTitle"), e1)); //$NON-NLS-1$
if (item != null) {
item.dispose(); item.dispose();
}
return; return;
} }
} else { } else {

4
memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
View file

@ -1235,7 +1235,7 @@ public class Rendering extends Composite implements IDebugEventSetListener
boolean changed = false; boolean changed = false;
if(fStartHigh == null || !high.equals(fStartHigh)) if(fStartHigh == null || !fStartHigh.equals(high))
{ {
fStartHigh = high; fStartHigh = high;
changed = true; changed = true;
@ -1267,7 +1267,7 @@ public class Rendering extends Composite implements IDebugEventSetListener
boolean changed = false; boolean changed = false;
if(fEndHigh == null || !high.equals(fEndHigh)) if(fEndHigh == null || !fEndHigh.equals(high))
{ {
fEndHigh = high; fEndHigh = high;
changed = true; changed = true;

2
memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java
View file

@ -99,10 +99,12 @@ public class ExportMemoryAction implements IViewActionDelegate {
} }
} }
else { else {
if (memBlock != null) {
initialStartAddr = BigInteger.valueOf(memBlock.getStartAddress()); initialStartAddr = BigInteger.valueOf(memBlock.getStartAddress());
} }
} }
} }
}
return new BlockAndAddress(memBlock, initialStartAddr); return new BlockAndAddress(memBlock, initialStartAddr);
} }