Skip to content

OnlineServices: Ensure HTTPManager is deleted before interface objects #108

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
+15 −6
Open

OnlineServices: Ensure HTTPManager is deleted before interface objects #108

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
15 changes: 9 additions & 6 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,15 @@ class NGMP_OnlineServicesManager

~NGMP_OnlineServicesManager()
{
// IMPORTANT: Delete HTTPManager BEFORE deleting interface objects
// HTTPManager::Shutdown() will invoke completion callbacks, which may reference interface objects
// We must ensure interfaces are still valid when callbacks execute
if (m_pHTTPManager != nullptr)
{
delete m_pHTTPManager;
m_pHTTPManager = nullptr;
}

if (m_pAuthInterface != nullptr)
{
delete m_pAuthInterface;
Expand All @@ -422,12 +431,6 @@ class NGMP_OnlineServicesManager
m_pRoomInterface = nullptr;
}

if (m_pHTTPManager != nullptr)
{
delete m_pHTTPManager;
m_pHTTPManager = nullptr;
}

// Reset shared_ptr, which will delete WebSocket only when all references are released
m_pWebSocket.reset();
}
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@ void HTTPRequest::InvokeCallbackIfComplete()
{
strResponse.clear();
}

// Invoke the callback
m_completionCallback(true, m_responseCode, strResponse, this);

// Clear the callback immediately after invocation to prevent use-after-free
// during std::function cleanup, especially during shutdown scenarios
m_completionCallback = nullptr;
}
}
}
Expand Down
Loading