Skip to content

bugfix(gui): Prevent null pointer dereference in WOLQuickMatchMenu #493

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
x64-dev merged 1 commit into from
May 7, 2026
+9 −1
Merged

bugfix(gui): Prevent null pointer dereference in WOLQuickMatchMenu #493

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/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,10 +1117,15 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();

// cannot connect to the lobby we joined
if (pLobbyInterface != nullptr)
{

pLobbyInterface->RegisterForCannotConnectToLobbyCallback([](void)
{
// TODO_QUICKMATCH: Show error message + stop matchmaking + enable buttons again
});
}


// get playlist list
NGMP_OnlineServices_MatchmakingInterface* pMatchmakingInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_MatchmakingInterface>();
Expand Down Expand Up @@ -1331,12 +1336,14 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
buttonText.format(L"%s", TheGameText->fetch("GUI:Buddies").str());
}
buttonBuddies->winSetText(buttonText);


}
});
}

// And also initialize it
if (buttonBuddies != nullptr && pSocialInterface->GetNumTotalNotifications() > 0)
if (buttonBuddies != nullptr && pSocialInterface != nullptr && pSocialInterface->GetNumTotalNotifications() > 0)
{
UnicodeString buttonText;
buttonText.format(L"%s [%d]", TheGameText->fetch("GUI:Buddies").str(), pSocialInterface->GetNumTotalNotifications());
Expand Down Expand Up @@ -2489,4 +2496,5 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms

return MSG_HANDLED;
}


Expand Down
Loading