diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h index 66ee38bc19c..4f4bc85051c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h @@ -51,7 +51,7 @@ class HTTPRequest bool InvokeDelayAction(); bool WaitingDelayAction() const { return m_timeRequestComplete != -1; } #endif - void Threaded_SetComplete(CURLcode result); + void Threaded_SetComplete(CURLcode result, bool bSkipCallback = false); // mainly used for downloads std::vector GetBuffer() { return m_vecBuffer; } @@ -97,4 +97,4 @@ class HTTPRequest std::function m_completionCallback = nullptr; std::function m_progressCallback = nullptr; -}; +}; diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp index 8ac79982f8b..eedd3ca4fa5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp @@ -91,7 +91,8 @@ void HTTPManager::Shutdown() HTTPRequest* pRequest = *it; if (pRequest != nullptr && pRequest->EasyHandleMatches(pCurlHandle)) { - pRequest->Threaded_SetComplete(m->data.result); + // Skip callback invocation during shutdown to avoid use-after-free + pRequest->Threaded_SetComplete(m->data.result, true); delete pRequest; m_vecRequestsInFlight.erase(it); break; @@ -226,7 +227,8 @@ void HTTPManager::Tick() #if defined(ARTIFICIAL_DELAY_HTTP_REQUESTS) pRequest->SetWaitingDelay(m->data.result); #else - pRequest->Threaded_SetComplete(m->data.result); + // Normal operation - invoke callbacks + pRequest->Threaded_SetComplete(m->data.result, false); vecItemsToRemove.push_back(pRequest); #endif } diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp index ac07945109e..75774321f1a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp @@ -35,8 +35,16 @@ HTTPRequest::HTTPRequest(EHTTPVerb httpVerb, EIPProtocolVersion protover, const HTTPRequest::~HTTPRequest() { - HTTPManager* pHTTPManager = NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager(); - pHTTPManager->RemoveHandleFromMulti(m_pCURL); + // Safely check if the manager is still valid before attempting to use it + NGMP_OnlineServicesManager* pOnlineServicesMgr = NGMP_OnlineServicesManager::GetInstance(); + if (pOnlineServicesMgr != nullptr) + { + HTTPManager* pHTTPManager = pOnlineServicesMgr->GetHTTPManager(); + if (pHTTPManager != nullptr) + { + pHTTPManager->RemoveHandleFromMulti(m_pCURL); + } + } curl_easy_cleanup(m_pCURL); @@ -90,7 +98,7 @@ void HTTPRequest::OnResponsePartialWrite(std::uint8_t* pBuffer, size_t numBytes) void HTTPRequest::InvokeCallbackIfComplete() { - if (m_bIsComplete) + if (m_bIsComplete && !m_bSkipCallback) { if (m_completionCallback != nullptr) { @@ -123,7 +131,8 @@ bool HTTPRequest::InvokeDelayAction() int64_t currTime = std::chrono::duration_cast(std::chrono::utc_clock::now().time_since_epoch()).count(); if (currTime - m_timeRequestComplete > 2000) { - Threaded_SetComplete(m_pendingCURLCode); + // Normal operation with artificial delay - invoke callbacks + Threaded_SetComplete(m_pendingCURLCode, false); return true; } } @@ -133,12 +142,13 @@ bool HTTPRequest::InvokeDelayAction() #endif -void HTTPRequest::Threaded_SetComplete(CURLcode result) +void HTTPRequest::Threaded_SetComplete(CURLcode result, bool bSkipCallback) { // store response code curl_easy_getinfo(m_pCURL, CURLINFO_RESPONSE_CODE, &m_responseCode); m_bIsComplete = true; + m_bSkipCallback = bSkipCallback; // finalize the size, so we can use .size etc m_vecBuffer.resize(m_currentBufSize_Used); @@ -171,8 +181,11 @@ void HTTPRequest::Threaded_SetComplete(CURLcode result) NetworkLog(ELogVerbosity::LOG_RELEASE, "[%p|%s] Response was %d - %s!", this, strURIRedacted.c_str(), m_responseCode, strResponse.c_str()); - // trigger callback - InvokeCallbackIfComplete(); + // trigger callback only if not skipping + if (!bSkipCallback) + { + InvokeCallbackIfComplete(); + } } void HTTPRequest::PlatformStartRequest()