diff options
| author | Daniel Molkentin <daniel@molkentin.de> | 2015-03-31 17:43:44 +0200 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-04-01 07:33:20 +0000 |
| commit | c1a67e7dc3a6f8876efa32cdbabbfde1c5a37bc6 (patch) | |
| tree | 2f547d771ab7453e97244da1a2641431e9c195e9 | |
| parent | 1458d1b31d2df20e79db9e873d36986bc87074a2 (diff) | |
Windows: Do not crash if SSL context is gone after root cert lookup
On Windows, we perform an extra certificate lookup for root CAs that
are not in Windows' (minimal) root store. This check can take up to
15 seconds. The SSL context can already be gone once we return. Hence
we now check for a non-null SSL context on Windows before proceeding.
Change-Id: I1951569d9b17da33fa604f7c9d8b33255acf200d
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 0e1a3e53c9..b132aec038 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1281,7 +1281,7 @@ void QSslSocketBackendPrivate::_q_caRootLoaded(QSslCertificate cert, QSslCertifi if (plainSocket) plainSocket->resume(); paused = false; - if (checkSslErrors()) + if (checkSslErrors() && ssl) continueHandshake(); } |