diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-11 14:14:31 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-11 14:14:31 +0000 |
commit | e166d7d1351834e21332ffd3b3523f06e691f26f (patch) | |
tree | 3da8d74b30adb8bc50fc1b5932886dd72da31799 /examples/corelib/ipc/localfortuneclient/client.cpp | |
parent | 182f4877bf9d9ff6dc92912751d5c7c4fb746fcb (diff) | |
parent | 905329200f2f3f9372bf07a001371c30c0663684 (diff) |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'examples/corelib/ipc/localfortuneclient/client.cpp')
-rw-r--r-- | examples/corelib/ipc/localfortuneclient/client.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/corelib/ipc/localfortuneclient/client.cpp b/examples/corelib/ipc/localfortuneclient/client.cpp index 122522f29d..d5a1525769 100644 --- a/examples/corelib/ipc/localfortuneclient/client.cpp +++ b/examples/corelib/ipc/localfortuneclient/client.cpp @@ -110,12 +110,13 @@ void Client::readFortune() in.setVersion(QDataStream::Qt_4_0); if (blockSize == 0) { - if (socket->bytesAvailable() < (int)sizeof(quint16)) + // Relies on the fact that QDataStream format streams a quint32 into sizeof(quint32) bytes + if (socket->bytesAvailable() < (int)sizeof(quint32)) return; in >> blockSize; } - if (in.atEnd()) + if (socket->bytesAvailable() < blockSize || in.atEnd()) return; QString nextFortune; |