From a75029c8014be492e1c2269466c1464c02577038 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Sat, 9 Jan 2021 01:01:36 +0100
Subject: WebTask: Fix reading of status code from aborted replies

---
 src/network/webtask.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src')

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(),
-- 
cgit v1.2.3