From f8badeda72813ee4d32e7672c4a98373cb7b5d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 4 Dec 2020 12:01:03 +0100 Subject: QSslSocket: Don't call 'transmit' in unencrypted mode At the same time I'll add a generic protection against being called in unprotected mode in the schannel backend (openssl already has it in a different form). Pick-to: 5.15 6.0 Change-Id: I97c1be6239c27e306de0af7ad568fbcfde09da71 Reviewed-by: Timur Pocheptsov --- src/network/ssl/qsslsocket_schannel.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/network/ssl/qsslsocket_schannel.cpp') diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp index 051eb3fc3f..1c482f56d7 100644 --- a/src/network/ssl/qsslsocket_schannel.cpp +++ b/src/network/ssl/qsslsocket_schannel.cpp @@ -1325,6 +1325,9 @@ void QSslSocketBackendPrivate::transmit() { Q_Q(QSslSocket); + if (mode == QSslSocket::UnencryptedMode) + return; // This function should not have been called + // Can happen if called through QSslSocket::abort->QSslSocket::close->QSslSocket::flush->here if (plainSocket->state() == QAbstractSocket::SocketState::UnconnectedState) return; -- cgit v1.2.3