Skip to content

[4.6.3] Attempt to fix crash in NetworkManager #30548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2025
Merged

[4.6.3] Attempt to fix crash in NetworkManager #30548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c52d7d8
Don't store NetworkManager as class member
RomanPudashkin Oct 15, 2025
cc92d32
Disconnect reply signals before leaving execRequest()
RomanPudashkin Oct 15, 2025
ddf564f
NetworkManager: add logs
RomanPudashkin Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/framework/network/internal/networkmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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();
}
3 changes: 2 additions & 1 deletion src/framework/network/internal/networkmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/musesounds/internal/musesoundscheckupdateservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions src/musesounds/internal/musesoundscheckupdateservice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
Loading