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

Mauller · helmutbuhler · xezon · commit 5005ed36022d · 2025-04-27T17:38:32.000+02:00
Co-authored-by: Helmut Buhler &lt;buhler@8gadgetpack.net&gt;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
@@ -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
 			{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
@@ -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
 				{

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,9 @@ void DockUpdate::loadDockPositions()`
`501`	`501`	`if( m_numberApproachPositions != DYNAMIC_APPROACH_VECTOR_FLAG )`
`502`	`502`	`{`
`503`	`503`	`// Dynamic means no bones`
`504`		`- Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE];`
	`504`	`+ // TheSuperHackers @fix helmutbuhler 19/04/2025 Zero initialize array to prevent uninitialized memory reads.`
	`505`	`+ // Important: the entire target vector is used for serialization and crc and must not contain random data.`
	`506`	`+ Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE] = {0};`
`505`	`507`	`m_numberApproachPositionBones = myDrawable->getPristineBonePositions( "DockWaiting", 1, approachBones, NULL, m_numberApproachPositions);`
`506`	`508`	`if( m_numberApproachPositions == m_approachPositions.size() )//safeguard: will always be true`
`507`	`509`	`{`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,9 @@ void DockUpdate::loadDockPositions()`
`510`	`510`	`if( m_numberApproachPositions != DYNAMIC_APPROACH_VECTOR_FLAG )`
`511`	`511`	`{`
`512`	`512`	`// Dynamic means no bones`
`513`		`- Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE];`
	`513`	`+ // TheSuperHackers @fix helmutbuhler 19/04/2025 Zero initialize array to prevent uninitialized memory reads.`
	`514`	`+ // Important: the entire target vector is used for serialization and crc and must not contain random data.`
	`515`	`+ Coord3D approachBones[DEFAULT_APPROACH_VECTOR_SIZE] = {0};`
`514`	`516`	`m_numberApproachPositionBones = myDrawable->getPristineBonePositions( "DockWaiting", 1, approachBones, NULL, m_numberApproachPositions);`
`515`	`517`	`if( m_numberApproachPositions == m_approachPositions.size() )//safeguard: will always be true`
`516`	`518`	`{`