summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2016-08-02 13:34:18 +0200
committerDavid Schulz <david.schulz@qt.io>2016-08-03 12:25:31 +0000
commit4b74fc4322fa889190f81b90f23538b88f6fa0aa (patch)
tree9fde8fbea0f7fbeb882b53a1578a04107e1f1906
parentc87d0d7b58e7fe6d5119cf5fddd734bf7c6df001 (diff)
downloadqt-creator-4b74fc4322fa889190f81b90f23538b88f6fa0aa.tar.gz
Debugger: Fix empty memory when viewing inaccessible address
Always report back when content for the memory view is requested. Task-number: QTCREATORBUG-16555 Change-Id: Idc6202a392899c5d524c696ac7342c4ea4487b1e Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/plugins/debugger/cdb/cdbengine.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 9287b5c3fa..3eae674a9f 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1518,12 +1518,16 @@ void CdbEngine::postFetchMemory(const MemoryViewCookie &cookie)
str << cookie.address << ' ' << cookie.length;
cmd.args = args;
cmd.callback = [this, cookie](const DebuggerResponse &response) {
- if (response.resultClass == ResultDone && cookie.agent) {
+ if (!cookie.agent)
+ return;
+ if (response.resultClass == ResultDone) {
const QByteArray data = QByteArray::fromHex(response.data.data().toUtf8());
if (unsigned(data.size()) == cookie.length)
cookie.agent->addLazyData(cookie.editorToken, cookie.address, data);
} else {
showMessage(response.data["msg"].data(), LogWarning);
+ cookie.agent->addLazyData(cookie.editorToken, cookie.address,
+ QByteArray (int(cookie.length), char()));
}
};
runCommand(cmd);