aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmldebug
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-12-02 22:07:22 +0200
committerOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-12-03 09:56:07 +0200
commit7096649fc267e3b12989f723d4e5cb7ae7b7c958 (patch)
tree3e689cae9d803037fa744c0655389486cb6b05b1 /src/libs/qmldebug
parentc9a48ad5b1e1eae4d9162ea0158b18ac1ed592e7 (diff)
parentf0226d9644e7936cc12109448490047ae52bc320 (diff)
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/libs/qmldebug')
-rw-r--r--src/libs/qmldebug/baseenginedebugclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmldebug/baseenginedebugclient.cpp b/src/libs/qmldebug/baseenginedebugclient.cpp
index 2b7e788feb..86f54741fc 100644
--- a/src/libs/qmldebug/baseenginedebugclient.cpp
+++ b/src/libs/qmldebug/baseenginedebugclient.cpp
@@ -152,7 +152,7 @@ void BaseEngineDebugClient::decode(QDataStream &ds,
int contextCount;
ds >> contextCount;
- for (int ii = 0; ii < contextCount; ++ii) {
+ for (int ii = 0; ii < contextCount && !ds.atEnd(); ++ii) {
c.m_contexts.append(ContextReference());
decode(ds, c.m_contexts.last());
}
@@ -160,7 +160,7 @@ void BaseEngineDebugClient::decode(QDataStream &ds,
int objectCount;
ds >> objectCount;
- for (int ii = 0; ii < objectCount; ++ii) {
+ for (int ii = 0; ii < objectCount && !ds.atEnd(); ++ii) {
ObjectReference obj;
decode(ds, obj, true);
obj.m_contextDebugId = c.m_debugId;