Skip to content

fix(logic): Improve validation of MSG_SET_RALLY_POINT in GameLogicDispatch #2441

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
xezon merged 2 commits into from
Mar 14, 2026
+26 −0
Merged

fix(logic): Improve validation of MSG_SET_RALLY_POINT in GameLogicDispatch #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ebbba1
fix(logic): Improve validation of MSG_SET_RALLY_POINT in GameLogicDis…
stephanmeesters Mar 11, 2026
775f022
Replicate in Generals
stephanmeesters Mar 12, 2026
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
13 changes: 13 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,21 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
{
Object *obj = findObjectByID( msg->getArgument( 0 )->objectID );
Coord3D dest = msg->getArgument( 1 )->location;

if (obj)
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @fix stephanmeesters 11/03/2026 Validate the owner of the source object
if ( obj->getControllingPlayer() != thisPlayer )
{
DEBUG_CRASH( ("MSG_SET_RALLY_POINT: Player '%ls' attempted to set the rally point of object '%s' owned by player '%ls'.",
thisPlayer->getPlayerDisplayName().str(),
obj->getTemplate()->getName().str(),
obj->getControllingPlayer()->getPlayerDisplayName().str()) );
break;
}
#endif

doSetRallyPoint( obj, dest );
}

Expand Down
13 changes: 13 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,21 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
{
Object *obj = findObjectByID( msg->getArgument( 0 )->objectID );
Coord3D dest = msg->getArgument( 1 )->location;

if (obj)
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @fix stephanmeesters 11/03/2026 Validate the owner of the source object
if ( obj->getControllingPlayer() != thisPlayer )
{
DEBUG_CRASH( ("MSG_SET_RALLY_POINT: Player '%ls' attempted to set the rally point of object '%s' owned by player '%ls'.",
thisPlayer->getPlayerDisplayName().str(),
obj->getTemplate()->getName().str(),
obj->getControllingPlayer()->getPlayerDisplayName().str()) );
break;
}
#endif

doSetRallyPoint( obj, dest );
}

Expand Down
Loading