From 213901d4508f08c09d8a43735cb7bbd93c442cc3 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Thu, 2 Sep 2010 16:44:02 +0000 Subject: [PATCH] Fix potential null pointer use --- .../cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java | 4 +++- .../eclipse/cdt/debug/ui/memory/traditional/Rendering.java | 4 ++-- .../debug/ui/memory/transport/actions/ExportMemoryAction.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java index 43a25c5e487..67f012ffb3d 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java @@ -416,7 +416,9 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM } catch (DebugException e1) { fGotoAddressBar.handleExpressionStatus(new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID, Messages.getString("MemoryBrowser.FailedToGoToAddressTitle"), e1)); //$NON-NLS-1$ - item.dispose(); + if (item != null) { + item.dispose(); + } return; } } else { diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java index fe8acb8c196..60e23b494e4 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java @@ -1235,7 +1235,7 @@ public class Rendering extends Composite implements IDebugEventSetListener boolean changed = false; - if(fStartHigh == null || !high.equals(fStartHigh)) + if(fStartHigh == null || !fStartHigh.equals(high)) { fStartHigh = high; changed = true; @@ -1267,7 +1267,7 @@ public class Rendering extends Composite implements IDebugEventSetListener boolean changed = false; - if(fEndHigh == null || !high.equals(fEndHigh)) + if(fEndHigh == null || !fEndHigh.equals(high)) { fEndHigh = high; changed = true; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java index 075ed6150ee..1fd2464adba 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java @@ -99,7 +99,9 @@ public class ExportMemoryAction implements IViewActionDelegate { } } else { - initialStartAddr = BigInteger.valueOf(memBlock.getStartAddress()); + if (memBlock != null) { + initialStartAddr = BigInteger.valueOf(memBlock.getStartAddress()); + } } } }