Skip to content

HTTP: Prevent use-after-free in HTTP request callbacks during shutdown #101

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −1
Open

HTTP: Prevent use-after-free in HTTP request callbacks during shutdown #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ class HTTPRequest

std::string GetURI() { return m_strURI; }

// Clear callbacks to prevent use-after-free during shutdown
void ClearCallbacks()
{
m_completionCallback = nullptr;
m_progressCallback = nullptr;
}


private:
void PlatformStartRequest();

Expand Down Expand Up @@ -97,4 +105,4 @@ class HTTPRequest
std::function<void(bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)> m_completionCallback = nullptr;

std::function<void(size_t bytesReceived)> m_progressCallback = nullptr;
};
};
Expand Down
10 changes: 10 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ void HTTPManager::Shutdown()

NetworkLog(ELogVerbosity::LOG_RELEASE, "[HTTPManager] Waiting for %d in-flight requests to complete...", (int)m_vecRequestsInFlight.size());

// Clear all callbacks on in-flight requests to prevent use-after-free
// when callbacks are invoked during shutdown with dangling pointers
for (HTTPRequest* pRequest : m_vecRequestsInFlight)
{
if (pRequest != nullptr)
{
pRequest->ClearCallbacks();
}
}

// Wait for all in-flight requests to complete
if (m_pCurl != nullptr)
{
Expand Down
Loading