TCF Debugger: fixed: the debugger disconnected with JSON syntax error exception while adding the symbol files and selecting them

2 files changed, 2 insertions, 2 deletions

diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
index 6ec4799e2..507197b97 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
@@ -888,7 +888,7 @@ public class MemoryMapWidget {
     }
 
     private String getSymbolFileInfo(final IMemoryMap.MemoryRegion r) {
-        if (channel == null || channel.getState() != IChannel.STATE_OPEN || r == null) return null;
+        if (channel == null || channel.getState() != IChannel.STATE_OPEN || r == null || r.getAddress() == null) return null;
         try {
             return new TCFTask<String>(channel) {
                 public void run() {
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java
index 1d2f0aef8..e02f7b144 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java
@@ -560,7 +560,7 @@ public class TCFNodeExecContext extends TCFNode implements ISymbolOwner, ITCFExe
     }
 
     public TCFDataCache<TCFSymFileRef> getSymFileInfo(final BigInteger addr) {
-        if (isDisposed()) return null;
+        if (addr == null || isDisposed()) return null;
         TCFDataCache<TCFSymFileRef> ref_cache;
         if (syms_info_lookup_cache != null) {
             ref_cache = syms_info_lookup_cache.get(addr);