bugfix(ghostobject): Fix crash in W3DGhostObjectManager::updateOrphanedObjects (#1569)

xezon · xezon · commit 98de109f0a58 · 2025-10-19T11:54:06.000+02:00
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -977,12 +977,14 @@ void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int play
 
 			if (playerIndexList != NULL && playerIndexCount > 0)
 			{
-				for (int i=0; i<playerIndexCount; i++, playerIndexList++)
+				int* playerIndex = playerIndexList;
+				int* const playerIndexEnd = playerIndexList + playerIndexCount;
+				for (; playerIndex < playerIndexEnd; ++playerIndex)
 				{
-					if (mod->m_parentSnapshots[*playerIndexList])
-						mod->getShroudStatus(*playerIndexList);
+					if (mod->m_parentSnapshots[*playerIndex])
+						mod->getShroudStatus(*playerIndex);
 
-					if (mod->m_parentSnapshots[*playerIndexList])
+					if (mod->m_parentSnapshots[*playerIndex])
 						numStoredSnapshots++;
 				}
 			}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -981,12 +981,14 @@ void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int play
 
 			if (playerIndexList != NULL && playerIndexCount > 0)
 			{
-				for (int i=0; i<playerIndexCount; i++, playerIndexList++)
+				int* playerIndex = playerIndexList;
+				int* const playerIndexEnd = playerIndexList + playerIndexCount;
+				for (; playerIndex < playerIndexEnd; ++playerIndex)
 				{
-					if (mod->m_parentSnapshots[*playerIndexList])
-						mod->getShroudStatus(*playerIndexList);
+					if (mod->m_parentSnapshots[*playerIndex])
+						mod->getShroudStatus(*playerIndex);
 
-					if (mod->m_parentSnapshots[*playerIndexList])
+					if (mod->m_parentSnapshots[*playerIndex])
 						numStoredSnapshots++;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -977,12 +977,14 @@ void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int play`
`977`	`977`
`978`	`978`	`if (playerIndexList != NULL && playerIndexCount > 0)`
`979`	`979`	`{`
`980`		`- for (int i=0; i<playerIndexCount; i++, playerIndexList++)`
	`980`	`+ int* playerIndex = playerIndexList;`
	`981`	`+ int* const playerIndexEnd = playerIndexList + playerIndexCount;`
	`982`	`+ for (; playerIndex < playerIndexEnd; ++playerIndex)`
`981`	`983`	`{`
`982`		`- if (mod->m_parentSnapshots[*playerIndexList])`
`983`		`- mod->getShroudStatus(*playerIndexList);`
	`984`	`+ if (mod->m_parentSnapshots[*playerIndex])`
	`985`	`+ mod->getShroudStatus(*playerIndex);`
`984`	`986`
`985`		`- if (mod->m_parentSnapshots[*playerIndexList])`
	`987`	`+ if (mod->m_parentSnapshots[*playerIndex])`
`986`	`988`	`numStoredSnapshots++;`
`987`	`989`	`}`
`988`	`990`	`}`
Original file line number	Diff line number	Diff line change
`@@ -981,12 +981,14 @@ void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int play`
`981`	`981`
`982`	`982`	`if (playerIndexList != NULL && playerIndexCount > 0)`
`983`	`983`	`{`
`984`		`- for (int i=0; i<playerIndexCount; i++, playerIndexList++)`
	`984`	`+ int* playerIndex = playerIndexList;`
	`985`	`+ int* const playerIndexEnd = playerIndexList + playerIndexCount;`
	`986`	`+ for (; playerIndex < playerIndexEnd; ++playerIndex)`
`985`	`987`	`{`
`986`		`- if (mod->m_parentSnapshots[*playerIndexList])`
`987`		`- mod->getShroudStatus(*playerIndexList);`
	`988`	`+ if (mod->m_parentSnapshots[*playerIndex])`
	`989`	`+ mod->getShroudStatus(*playerIndex);`
`988`	`990`
`989`		`- if (mod->m_parentSnapshots[*playerIndexList])`
	`991`	`+ if (mod->m_parentSnapshots[*playerIndex])`
`990`	`992`	`numStoredSnapshots++;`
`991`	`993`	`}`
`992`	`994`	`}`