From 9ac323f7cd4b34b7dff25d64251b4cd8c5ef60a4 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Thu, 20 Jan 2022 10:52:17 +0100
Subject: [PATCH] QTlsBackend/QSslSocket - check the arguments we pass to
 QObject::connect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not to have warnings about invalid (nullptr) parameters.

Change-Id: I5fdfa7e99df0f3c9907055cf244efa5a56b21c11
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/network/ssl/qsslsocket.cpp  | 10 ++++++----
 src/network/ssl/qtlsbackend.cpp |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index de92f486cd..453d7a8721 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -3119,10 +3119,12 @@ QTlsBackend *QSslSocketPrivate::tlsBackendInUse()
     }
 
     tlsBackend = QTlsBackend::findBackend(activeBackendName);
-    QObject::connect(tlsBackend, &QObject::destroyed, [] {
-        const QMutexLocker locker(&backendMutex);
-        tlsBackend = nullptr;
-    });
+    if (tlsBackend) {
+        QObject::connect(tlsBackend, &QObject::destroyed, [] {
+            const QMutexLocker locker(&backendMutex);
+            tlsBackend = nullptr;
+        });
+    }
     return tlsBackend;
 }
 
diff --git a/src/network/ssl/qtlsbackend.cpp b/src/network/ssl/qtlsbackend.cpp
index a510e95f92..dbfbddc379 100644
--- a/src/network/ssl/qtlsbackend.cpp
+++ b/src/network/ssl/qtlsbackend.cpp
@@ -203,9 +203,11 @@ QTlsBackend::QTlsBackend()
     if (backends())
         backends->addBackend(this);
 
-    connect(QCoreApplication::instance(), &QCoreApplication::destroyed, this, [this] {
-        delete this;
-    });
+    if (QCoreApplication::instance()) {
+        connect(QCoreApplication::instance(), &QCoreApplication::destroyed, this, [this] {
+            delete this;
+        });
+    }
 }
 
 /*!