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

Schannel: check that plainsocket is open before use

Browse Source 
In reality I think it should be covered elsewhere, before reaching
the TLS code. But this is a simple fix to avoid an unnecessary warning.

This is actually quite similar to the resolution in
ef4ba0285f9c5dd5ee2dca1e0cefee45eba3477c.

Technically checking isWritable would be more correct, but Qt is usually
the one to open the socket, and we open for both read and write anyway.

Fixes: QTBUG-116550
Pick-to: 6.6 6.5
Change-Id: I4996b18b5b65c434d91543451186f335e201604f
Reviewed-by: Mate Barany <mate.barany@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 74f16c0ed5f0e0bb05e8a9b40266524cec8e4257)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2024-02-21 17:35:58 +01:00 committed by Qt Cherry-pick Bot
parent 6c30199c45
commit 4d3a69cea3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/tls/schannel/qtls_schannel.cpp
View File

@ -1023,8 +1023,10 @@ bool TlsCryptographSchannel::sendToken(void *token, unsigned long tokenLength, b
Q_ASSERT(d); Q_ASSERT(d);
auto *plainSocket = d->plainTcpSocket(); auto *plainSocket = d->plainTcpSocket();
Q_ASSERT(plainSocket); Q_ASSERT(plainSocket);
if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()) if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()
|| !plainSocket->isOpen()) {
return false; return false;
}
const qint64 written = plainSocket->write(static_cast<const char *>(token), tokenLength); const qint64 written = plainSocket->write(static_cast<const char *>(token), tokenLength);
if (written != qint64(tokenLength)) { if (written != qint64(tokenLength)) {
@ -1387,7 +1389,8 @@ bool TlsCryptographSchannel::performHandshake()
auto *plainSocket = d->plainTcpSocket(); auto *plainSocket = d->plainTcpSocket();
Q_ASSERT(plainSocket); Q_ASSERT(plainSocket);
if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()) { if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()
|| !plainSocket->isOpen()) {
setErrorAndEmit(d, QAbstractSocket::RemoteHostClosedError, setErrorAndEmit(d, QAbstractSocket::RemoteHostClosedError,
QSslSocket::tr("The TLS/SSL connection has been closed")); QSslSocket::tr("The TLS/SSL connection has been closed"));
return false; return false;
@ -1763,8 +1766,10 @@ void TlsCryptographSchannel::transmit()
return; // This function should not have been called return; // This function should not have been called
// Can happen if called through QSslSocket::abort->QSslSocket::close->QSslSocket::flush->here // Can happen if called through QSslSocket::abort->QSslSocket::close->QSslSocket::flush->here
if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()) if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()
|| !plainSocket->isOpen()) {
return; return;
}
if (schannelState != SchannelState::Done) { if (schannelState != SchannelState::Done) {
continueHandshake(); continueHandshake();