mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-26 06:15:48 +03:00
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From c1a67e7dc3a6f8876efa32cdbabbfde1c5a37bc6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Molkentin <daniel@molkentin.de>
|
||
|
|
Date: Tue, 31 Mar 2015 17:43:44 +0200
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
src/network/ssl/qsslsocket_openssl.cpp | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
|
||
|
|
index 0e1a3e5..b132aec 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();
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.9.1
|