Skip to content

[GEN][ZH] Fix uninitialized memory read in DockUpdate::loadDockPositions #731

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 1 commit into from
Apr 27, 2025
Merged

[GEN][ZH] Fix uninitialized memory read in DockUpdate::loadDockPositions #731

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
4 changes: 3 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,9 @@ void DockUpdate::loadDockPositions()
if( m_numberApproachPositions != DYNAMIC_APPROACH_VECTOR_FLAG )
{
// Dynamic means no bones
Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE];
// TheSuperHackers @fix helmutbuhler 19/04/2025 Zero initialize array to prevent uninitialized memory reads.
// Important: the entire target vector is used for serialization and crc and must not contain random data.
Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE] = {0};
m_numberApproachPositionBones = myDrawable->getPristineBonePositions( "DockWaiting", 1, approachBones, NULL, m_numberApproachPositions);
if( m_numberApproachPositions == m_approachPositions.size() )//safeguard: will always be true
{
Expand Down
4 changes: 3 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,9 @@ void DockUpdate::loadDockPositions()
if( m_numberApproachPositions != DYNAMIC_APPROACH_VECTOR_FLAG )
{
// Dynamic means no bones
Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE];
// TheSuperHackers @fix helmutbuhler 19/04/2025 Zero initialize array to prevent uninitialized memory reads.
// Important: the entire target vector is used for serialization and crc and must not contain random data.
Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE] = {0};
m_numberApproachPositionBones = myDrawable->getPristineBonePositions( "DockWaiting", 1, approachBones, NULL, m_numberApproachPositions);
if( m_numberApproachPositions == m_approachPositions.size() )//safeguard: will always be true
{
Expand Down