diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2014-08-04 15:19:37 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2014-09-23 16:55:42 +0200 |
| commit | 48a4a67e8de835d4811560dc99398e365317d490 (patch) | |
| tree | 88812bab913ce18faa40062fde3e64b269c9d54e /src/network/socket/qabstractsocket.cpp | |
| parent | 9165815c89d34014e489fd6593f37e8c6ab8c397 (diff) | |
Fix QAbstractSocket::readData() behavior on buffered socket
Remove an useless check which spontaneously allow direct reads from the
socket engine.
Change-Id: Ia3d2a572d6f1563d613fe2f00d0d6849df259827
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index e572745d51..d9185d5efb 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2420,7 +2420,7 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize) return 0; // This is for a buffered QTcpSocket - if (d->isBuffered && d->buffer.isEmpty()) + if (d->isBuffered) // if we're still connected, return 0 indicating there may be more data in the future // if we're not connected, return -1 indicating EOF return d->state == QAbstractSocket::ConnectedState ? qint64(0) : qint64(-1); |