diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-08 17:15:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-08 17:15:55 +0200 |
| commit | 3e71810cf3153e4331fc075a73b6408adcf33654 (patch) | |
| tree | 9f5fbb7a5dc2a902b380dd69a222c0f2cd6eb760 /examples | |
| parent | 6feec9da93032d11a768802ac2187d9d4153b1ec (diff) | |
| parent | ebd1046323615f22192055a94438bf85fc360ca3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qhttpnetworkconnection.cpp
src/network/access/qhttpnetworkconnection_p.h
Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/ipc/localfortuneclient/client.cpp | 5 | ||||
| -rw-r--r-- | examples/corelib/ipc/localfortuneclient/client.h | 2 | ||||
| -rw-r--r-- | examples/corelib/ipc/localfortuneserver/server.cpp | 4 |
3 files changed, 6 insertions, 5 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; diff --git a/examples/corelib/ipc/localfortuneclient/client.h b/examples/corelib/ipc/localfortuneclient/client.h index 0400389989..8e628efcee 100644 --- a/examples/corelib/ipc/localfortuneclient/client.h +++ b/examples/corelib/ipc/localfortuneclient/client.h @@ -86,7 +86,7 @@ private: QLocalSocket *socket; QString currentFortune; - quint16 blockSize; + quint32 blockSize; }; #endif diff --git a/examples/corelib/ipc/localfortuneserver/server.cpp b/examples/corelib/ipc/localfortuneserver/server.cpp index 753f629e6a..2eee4760be 100644 --- a/examples/corelib/ipc/localfortuneserver/server.cpp +++ b/examples/corelib/ipc/localfortuneserver/server.cpp @@ -106,10 +106,10 @@ void Server::sendFortune() QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); out.setVersion(QDataStream::Qt_4_0); - out << (quint16)0; + out << (quint32)0; out << fortunes.at(qrand() % fortunes.size()); out.device()->seek(0); - out << (quint16)(block.size() - sizeof(quint16)); + out << (quint32)(block.size() - sizeof(quint32)); QLocalSocket *clientConnection = server->nextPendingConnection(); connect(clientConnection, SIGNAL(disconnected()), |