Merge pull request #30548 from RomanPudashkin/network_manager_crash

[4.6.3] Attempt to fix crash in NetworkManager

Author: DmitryArefiev

src/framework/network/internal/networkmanager.cpp

@@ -81,6 +81,8 @@ Ret NetworkManager::del(const QUrl& url, IncomingDevice* incomingData, const Req
 Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, IncomingDevice* incomingData, OutgoingDevice* outgoingData,
                                 const RequestHeaders& headers)
 {
+    LOGI() << "Start: " << requestTypeToString(requestType) << ", url: " << url.toString();
+
     if (outgoingData && outgoingData->device()) {
         if (!openDevice(outgoingData->device(), QIODevice::ReadOnly)) {
             return make_ret(Err::FiledOpenIODeviceRead);
@@ -129,13 +131,19 @@ Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, Incomi
 
     m_progress.finish(ret);
 
+    if (reply) {
+        reply->disconnect();
+    }
+
     if (outgoingData && outgoingData->device()) {
         closeDevice(outgoingData->device());
     }
 
     closeDevice(m_incomingData);
     m_incomingData = nullptr;
 
+    LOGI() << "Finish: " << requestTypeToString(requestType) << ", url: " << url.toString();
+
     return ret;
 }
 
@@ -307,3 +315,17 @@ Ret NetworkManager::errorFromReply(const QNetworkReply* reply) const
 
     return ret;
 }
+
+String NetworkManager::requestTypeToString(RequestType type)
+{
+    switch (type) {
+    case GET_REQUEST: return u"GET";
+    case HEAD_REQUEST: return u"HEAD";
+    case POST_REQUEST: return u"POST";
+    case PUT_REQUEST: return u"PUT";
+    case PATCH_REQUEST: return u"PATCH";
+    case DELETE_REQUEST: return u"DELETE";
+    }
+
+    return String();
+}

src/framework/network/internal/networkmanager.h

@@ -84,7 +84,8 @@ class NetworkManager : public QObject, public INetworkManager, public Injectable
     Ret waitForReplyFinished(QNetworkReply* reply, int timeoutMs);
     Ret errorFromReply(const QNetworkReply* reply) const;
 
-private:
+    static String requestTypeToString(RequestType type);
+
     QNetworkAccessManager* m_manager = nullptr;
     IncomingDevice* m_incomingData = nullptr;
     QNetworkReply* m_reply = nullptr;

src/musesounds/internal/musesoundscheckupdateservice.cpp

@@ -83,9 +83,9 @@ muse::RetVal<ReleaseInfo> MuseSoundsCheckUpdateService::checkForUpdate()
 
     QBuffer buff;
     QUrl url = configuration()->checkForMuseSoundsUpdateUrl();
-    m_networkManager = networkManagerCreator()->makeNetworkManager();
+    INetworkManagerPtr networkManager = networkManagerCreator()->makeNetworkManager();
 
-    Ret getUpdateInfo = m_networkManager->get(url, &buff);
+    Ret getUpdateInfo = networkManager->get(url, &buff);
 
     if (!getUpdateInfo) {
         LOGE() << getUpdateInfo.toString();

src/musesounds/internal/musesoundscheckupdateservice.h

@@ -64,8 +64,6 @@ class MuseSoundsCheckUpdateService : public IMuseSoundsCheckUpdateService, publi
 
     muse::RetVal<muse::update::ReleaseInfo> m_lastCheckResult;
     muse::io::path_t m_installatorPath;
-
-    muse::network::INetworkManagerPtr m_networkManager;
     muse::Progress m_updateProgress;
 };
 }