From f78a189da5d9e13a96a52b9d17cdc80df06ed8c8 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 27 May 2017 00:54:56 +0200 Subject: QSSLSocket::readData return -1 when socket is not connected As QAbstractSocket::readData does and as the documentation of QIODevice says "this function returns -1 in those cases (that is, reading on a closed socket..." Change-Id: I1e64673f6a6d792a640bd6cb28b2bb5a0f18dc36 Reviewed-by: Aleix Pol Reviewed-by: Edward Welbourne --- src/network/ssl/qsslsocket.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/network/ssl') diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 84b8f3a8d9..0e4b049353 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1993,6 +1993,8 @@ qint64 QSslSocket::readData(char *data, qint64 maxlen) // possibly trigger another transmit() to decrypt more data from the socket if (d->plainSocket->bytesAvailable()) QMetaObject::invokeMethod(this, "_q_flushReadBuffer", Qt::QueuedConnection); + else if (d->state != QAbstractSocket::ConnectedState) + return maxlen ? qint64(-1) : qint64(0); } return readBytes; -- cgit v1.2.3