MainWindow::sslErrors(): check that the network reply is alive

Fixes #688.
quotient-im · Jul 22, 2023 · b655369 · b655369
1 parent 2a9aee2
commit b655369
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
@@ -1370,7 +1370,8 @@ void MainWindow::networkError(Connection* c)
     });
 }
 
-void MainWindow::sslErrors(QNetworkReply* reply, const QList<QSslError>& errors)
+void MainWindow::sslErrors(const QPointer<QNetworkReply>& reply,
+                           const QList<QSslError>& errors)
 {
     for (const auto& error: errors)
     {
@@ -1398,7 +1399,10 @@ void MainWindow::sslErrors(QNetworkReply* reply, const QList<QSslError>& errors)
             return;
         Quotient::NetworkAccessManager::addIgnoredSslError(error);
     }
-    reply->ignoreSslErrors(errors);
+    // If a message box above is left open for too long, the reply may timeout
+    // and self-delete (#688) - double-check that it's still alive
+    if (reply)
+        reply->ignoreSslErrors(errors);
 }
 
 void MainWindow::proxyAuthenticationRequired(const QNetworkProxy&,

diff --git a/client/mainwindow.h b/client/mainwindow.h
@@ -73,7 +73,8 @@ class MainWindow: public QMainWindow, public Quotient::UriResolverBase {
 
         void reloginNeeded(Connection* c, const QString& message = {});
         void networkError(Connection* c);
-        void sslErrors(QNetworkReply* reply, const QList<QSslError>& errors);
+        void sslErrors(const QPointer<QNetworkReply>& reply,
+                       const QList<QSslError>& errors);
         void proxyAuthenticationRequired(const QNetworkProxy& /* unused */,
                                          QAuthenticator* auth);