diff options
| -rw-r--r-- | dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java | 4 | ||||
| -rw-r--r-- | dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java index 7b66008ffac..fa9c0e3b3d3 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java @@ -1661,7 +1661,9 @@ public class MIExpressions extends AbstractDsfService implements IMIExpressions, // When getting an MIFunctionFinishedEvent we must set // a proper alias for the convenience variable String resultVar = ((MIFunctionFinishedEvent)miEvent).getGDBResultVar(); - fReturnValueAliases.createAlias(stoppedEventThread, resultVar); + if (resultVar != null && !resultVar.isEmpty()) { + fReturnValueAliases.createAlias(stoppedEventThread, resultVar); + } } // Keep track of the latest method the thread is stopped in. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java index 71644f5e1e2..0f88bbe7f8d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java @@ -1047,7 +1047,9 @@ public class MIStack extends AbstractDsfService String name = ((MIFunctionFinishedEvent)miEvent).getGDBResultVar(); String value = ((MIFunctionFinishedEvent)miEvent).getReturnValue(); - fThreadToReturnVariable.put(finishedEventThread, new VariableData(new MIArg(name, value))); + if (name != null && !name.isEmpty() && value != null && !value.isEmpty()) { + fThreadToReturnVariable.put(finishedEventThread, new VariableData(new MIArg(name, value))); + } } } } |