Skip to content

fix(aiupdate): Fix XFER and CRC of AIUpdateInterface::m_guardTargetType #2662

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 4 commits into from
May 1, 2026
Merged

fix(aiupdate): Fix XFER and CRC of AIUpdateInterface::m_guardTargetType #2662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e851b86
fix(aiupdate): Fix XFER of AIUpdateInterface::m_guardTargetType.
Caball009 Apr 29, 2026
1d026b0
Added retail compatibility guards + bumped the xfer version.
Caball009 Apr 29, 2026
3852433
Addressed feedback.
Caball009 Apr 30, 2026
3e8a12c
Replicated in Generals.
Caball009 May 1, 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
31 changes: 27 additions & 4 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4808,12 +4808,21 @@ void AIUpdateInterface::crc( Xfer *x )
// ------------------------------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version */
* 1: Initial version, contains specific surrender and demoralize variables
* 2: Added m_demoralizedFramesLeft (behind ALLOW_DEMORALIZE)
* 3: Removed lastFrameMoved and repulsorCountdown; removed surrender and demoralize variables
* 4: Read m_curLocomotorSet from ini
* 5: TheSuperHackers @fix Fixed out-of-bounds xfer of m_guardTargetType
*/
// ------------------------------------------------------------------------------------------------
void AIUpdateInterface::xfer( Xfer *xfer )
{
// version
const XferVersion currentVersion = 4;
#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
const XferVersion currentVersion = 4;
#else
const XferVersion currentVersion = 5;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand All @@ -4830,8 +4839,22 @@ void AIUpdateInterface::xfer( Xfer *xfer )
xfer->xferObjectID(&m_currentVictimID);
xfer->xferReal(&m_desiredSpeed);
xfer->xferUser(&m_lastCommandSource, sizeof(m_lastCommandSource));
xfer->xferUser(&m_guardTargetType[0], sizeof(m_guardTargetType));
xfer->xferUser(&m_guardTargetType[1], sizeof(m_guardTargetType));

if (version < 5)
{
// TheSuperHackers @fix The original code effectively accessed m_guardTargetType[0], [1], [1], [2].
// The last one is out-of-bounds and points to m_locationToGuard.
static_assert(sizeof(m_locationToGuard) >= sizeof(m_guardTargetType[2]), "Xfer size must not exceed variable size");

xfer->xferUser(&m_guardTargetType[0], sizeof(m_guardTargetType));
xfer->xferUser(&m_guardTargetType[1], sizeof(m_guardTargetType[1]));
xfer->xferUser(&m_locationToGuard, sizeof(m_guardTargetType[2]));
}
else
{
xfer->xferUser(m_guardTargetType, sizeof(m_guardTargetType));
}

xfer->xferCoord3D(&m_locationToGuard);

xfer->xferObjectID(&m_objectToGuard);
Expand Down
31 changes: 27 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5056,12 +5056,21 @@ void AIUpdateInterface::crc( Xfer *x )
// ------------------------------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version */
* 1: Initial version, contains specific surrender and demoralize variables
* 2: Added m_demoralizedFramesLeft (behind ALLOW_DEMORALIZE)
* 3: Removed lastFrameMoved and repulsorCountdown; removed surrender and demoralize variables
* 4: Read m_curLocomotorSet from ini
* 5: TheSuperHackers @fix Fixed out-of-bounds xfer of m_guardTargetType
*/
// ------------------------------------------------------------------------------------------------
void AIUpdateInterface::xfer( Xfer *xfer )
{
// version
const XferVersion currentVersion = 4;
#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
const XferVersion currentVersion = 4;
#else
const XferVersion currentVersion = 5;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand All @@ -5078,8 +5087,22 @@ void AIUpdateInterface::xfer( Xfer *xfer )
xfer->xferObjectID(&m_currentVictimID);
xfer->xferReal(&m_desiredSpeed);
xfer->xferUser(&m_lastCommandSource, sizeof(m_lastCommandSource));
xfer->xferUser(&m_guardTargetType[0], sizeof(m_guardTargetType));
xfer->xferUser(&m_guardTargetType[1], sizeof(m_guardTargetType));

if (version < 5)
{
// TheSuperHackers @fix The original code effectively accessed m_guardTargetType[0], [1], [1], [2].
// The last one is out-of-bounds and points to m_locationToGuard.
static_assert(sizeof(m_locationToGuard) >= sizeof(m_guardTargetType[2]), "Xfer size must not exceed variable size");

xfer->xferUser(&m_guardTargetType[0], sizeof(m_guardTargetType));
xfer->xferUser(&m_guardTargetType[1], sizeof(m_guardTargetType[1]));
xfer->xferUser(&m_locationToGuard, sizeof(m_guardTargetType[2]));
}
else
{
xfer->xferUser(m_guardTargetType, sizeof(m_guardTargetType));
}

xfer->xferCoord3D(&m_locationToGuard);

xfer->xferObjectID(&m_objectToGuard);
Expand Down
Loading