Skip to content

fix(logic): Improve validation of MSG_DO_SPECIAL_POWER and variants in GameLogicDispatch #2380

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 5 commits into from
Mar 14, 2026
Merged

fix(logic): Improve validation of MSG_DO_SPECIAL_POWER and variants in GameLogicDispatch #2380

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2803db9
fix(logic): Improve validation of MSG_DO_SPECIAL_POWER and variants i…
stephanmeesters Mar 1, 2026
2087cec
Cleanup using thisPlayer
stephanmeesters Mar 2, 2026
1b37cba
Refine debug logging
stephanmeesters Mar 4, 2026
45ef03d
Use RETAIL_COMPATIBLE_CRC
stephanmeesters Mar 8, 2026
4e7c9e3
Replicate in Generals
stephanmeesters Mar 14, 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
28 changes: 28 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 @@ -680,6 +680,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
Object* source = findObjectByID(sourceID);
if (source != nullptr)
Comment thread
Caball009 marked this conversation as resolved.
{
// TheSuperHackers @fix stephanmeesters 01/03/2026 Validate the origin of the source object
if ( source->getControllingPlayer() != thisPlayer )
Comment thread
xezon marked this conversation as resolved.
{
DEBUG_CRASH( ("MSG_DO_SPECIAL_POWER: Player at index '%d' doesn't control the object with sourceID '%d'.", thisPlayer->getPlayerIndex(), (Int)sourceID) );
Comment thread
xezon marked this conversation as resolved.
Outdated
break;
}

AIGroupPtr theGroup = TheAI->createGroup();
theGroup->add(source);
theGroup->groupDoSpecialPower( specialPowerID, options );
Expand Down Expand Up @@ -725,6 +732,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
Object* source = findObjectByID(sourceID);
if (source != nullptr)
{
// TheSuperHackers @fix stephanmeesters 01/03/2026 Validate the origin of the source object
if ( source->getControllingPlayer() != thisPlayer )
{
DEBUG_CRASH( ("MSG_DO_SPECIAL_POWER_AT_LOCATION: Player at index '%d' doesn't control the object with sourceID '%d'.", thisPlayer->getPlayerIndex(), (Int)sourceID) );
break;
}

Comment thread
stephanmeesters marked this conversation as resolved.
Outdated
AIGroupPtr theGroup = TheAI->createGroup();
theGroup->add(source);
theGroup->groupDoSpecialPowerAtLocation( specialPowerID, &targetCoord, angle, objectInWay, options );
Expand Down Expand Up @@ -768,6 +782,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
Object* source = findObjectByID(sourceID);
if (source != nullptr)
{
// TheSuperHackers @fix stephanmeesters 01/03/2026 Validate the origin of the source object
if ( source->getControllingPlayer() != thisPlayer )
{
DEBUG_CRASH( ("MSG_DO_SPECIAL_POWER_AT_OBJECT: Player at index '%d' doesn't control the object with sourceID '%d'.", thisPlayer->getPlayerIndex(), (Int)sourceID) );
Comment thread
stephanmeesters marked this conversation as resolved.
Outdated
break;
}

AIGroupPtr theGroup = TheAI->createGroup();
theGroup->add(source);
theGroup->groupDoSpecialPowerAtObject( specialPowerID, target, options );
Expand Down Expand Up @@ -1211,6 +1232,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
Object* source = findObjectByID(sourceID);
if (source != nullptr)
{
// TheSuperHackers @fix stephanmeesters 01/03/2026 Validate the origin of the source object
if ( source->getControllingPlayer() != thisPlayer )
{
DEBUG_CRASH( ("MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION: Player at index '%d' doesn't control the object with sourceID '%d'.", thisPlayer->getPlayerIndex(), (Int)sourceID) );
break;
}

AIGroupPtr theGroup = TheAI->createGroup();
theGroup->add(source);
theGroup->groupOverrideSpecialPowerDestination( spType, loc, CMD_FROM_PLAYER );
Expand Down
Loading