1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle short reads in the local sockets example

Browse Source 
Protection against short reads was already half implemented,
blockSize was being sent by the server but never used by the client.

Also, blockSize was bumped to quint32: If you're in a position where
short reads can happen then quint16 is probably not enough to hold the
size of your data. On Linux I could only reproduce short reads for
messages > 500K.

Change-Id: I191a3d781da1d8a119debbdafae641c8340a1da2
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Sérgio Martins 2016-08-28 21:34:32 +01:00 committed by Giuseppe D'Angelo
parent f9acbaccde
commit dd00f6dd91
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/corelib/ipc/localfortuneclient/client.cpp
View File

@ -100,12 +100,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;

2
examples/corelib/ipc/localfortuneclient/client.h
View File

@ -76,7 +76,7 @@ private:
QLocalSocket *socket;
QString currentFortune;
quint16 blockSize;
quint32 blockSize;
};
#endif

4
examples/corelib/ipc/localfortuneserver/server.cpp
View File

@ -96,10 +96,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()),