WebTask: Fix reading of status code from aborted replies

1 files changed, 14 insertions, 4 deletions

diff --git a/src/network/webtask.cpp b/src/network/webtask.cpp
index 2fb4729083..af3329beaa 100644
--- a/src/network/webtask.cpp
+++ b/src/network/webtask.cpp
@@ -26,14 +26,24 @@ void registerMetaTypesOnce() {
 }
 
 int readStatusCode(
-        const QNetworkReply* networkReply) {
+        const QNetworkReply& networkReply) {
     const QVariant statusCodeAttr =
-            networkReply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+            networkReply.attribute(QNetworkRequest::HttpStatusCodeAttribute);
+    if (!statusCodeAttr.isValid()) {
+        // No status code available
+        return kHttpStatusCodeInvalid;
+    }
+    VERIFY_OR_DEBUG_ASSERT(statusCodeAttr.canConvert<int>()) {
+        kLogger.warning()
+                << "Invalid status code attribute"
+                << statusCodeAttr;
+        return kHttpStatusCodeInvalid;
+    }
     bool statusCodeValid = false;
     const int statusCode = statusCodeAttr.toInt(&statusCodeValid);
     VERIFY_OR_DEBUG_ASSERT(statusCodeValid && HttpStatusCode_isValid(statusCode)) {
         kLogger.warning()
-                << "Invalid or missing status code attribute"
+                << "Failed to read status code attribute"
                 << statusCodeAttr;
         return kHttpStatusCodeInvalid;
     }
@@ -364,7 +374,7 @@ void WebTask::slotNetworkReplyFinished() {
         m_timeoutTimerId = kInvalidTimerId;
     }
 
-    const auto statusCode = readStatusCode(pFinishedNetworkReply);
+    const auto statusCode = readStatusCode(*pFinishedNetworkReply);
     if (pFinishedNetworkReply->error() != QNetworkReply::NetworkError::NoError) {
         onNetworkError(
                 pFinishedNetworkReply->error(),