summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-10-15 17:45:08 +0200
committerhjk <hjk@theqtcompany.com>2015-10-16 05:59:26 +0000
commite696b6af08dc23f466ca1d2574d327a41af968f9 (patch)
tree19da99e64c156bb3d5826650c4ea720e9ff82c91
parent01006580c10a4b9f8be689af61e90cd0f9134688 (diff)
downloadqt-creator-e696b6af08dc23f466ca1d2574d327a41af968f9.tar.gz
Debugger: Work around libstd++ crash
Task-number: QTCREATORBUG-15183 Change-Id: I7f0d00c984bb19f025b5e2f576017e0a982ed79a Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 670ba83a99..6563e527e0 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3274,8 +3274,9 @@ void GdbEngine::handleStackListFrames(const DebuggerResponse &response, bool isF
GdbMi frames = response.data["stack"]; // C++
if (!frames.isValid() || frames.childCount() == 0) { // Mixed.
- frames.fromStringMultiple(response.consoleStreamOutput);
- frames = frames["frames"];
+ GdbMi mixed;
+ mixed.fromStringMultiple(response.consoleStreamOutput);
+ frames = mixed["frames"];
}
stackHandler()->setFramesAndCurrentIndex(frames, isFull);