[GEN][ZH] Prevent reading invalid data in LoadScreen (#1090)

xezon · web-flow · commit af35ed98b026 · 2025-06-21T11:11:24.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -886,6 +886,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		return;
 	}
 	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
@@ -1213,6 +1214,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		return;
 	}
 	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
@@ -1365,6 +1367,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		return;
 	}
 
 	if (m_oldProgress[playerId] == percentage)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -1476,6 +1476,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		return;
 	}
 	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
@@ -1843,6 +1844,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		return;
 	}
 	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
@@ -1995,6 +1997,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		return;
 	}
 
 	if (m_oldProgress[playerId] == percentage)

Original file line number	Diff line number	Diff line change
`@@ -886,6 +886,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)`
`886`	`886`	`if( percentage < 0 \|\| percentage > 100 \|\| playerId >= MAX_SLOTS \|\| playerId < 0 \|\| m_playerLookup[playerId] == -1)`
`887`	`887`	`{`
`888`	`888`	`DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));`
	`889`	`+ return;`
`889`	`890`	`}`
`890`	`891`	`//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));`
`891`	`892`	`if(m_progressBars[m_playerLookup[playerId]])`
`@@ -1213,6 +1214,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)`
`1213`	`1214`	`if( percentage < 0 \|\| percentage > 100 \|\| playerId >= MAX_SLOTS \|\| playerId < 0 \|\| m_playerLookup[playerId] == -1)`
`1214`	`1215`	`{`
`1215`	`1216`	`DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));`
	`1217`	`+ return;`
`1216`	`1218`	`}`
`1217`	`1219`	`//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));`
`1218`	`1220`	`if(m_progressBars[m_playerLookup[playerId]])`
`@@ -1365,6 +1367,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS`
`1365`	`1367`	`if( percentage < 0 \|\| percentage > 100 \|\| playerId >= MAX_SLOTS \|\| playerId < 0 \|\| m_playerLookup[playerId] == -1)`
`1366`	`1368`	`{`
`1367`	`1369`	`DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));`
	`1370`	`+ return;`
`1368`	`1371`	`}`
`1369`	`1372`
`1370`	`1373`	`if (m_oldProgress[playerId] == percentage)`
Original file line number	Diff line number	Diff line change
`@@ -1476,6 +1476,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)`
`1476`	`1476`	`if( percentage < 0 \|\| percentage > 100 \|\| playerId >= MAX_SLOTS \|\| playerId < 0 \|\| m_playerLookup[playerId] == -1)`
`1477`	`1477`	`{`
`1478`	`1478`	`DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));`
	`1479`	`+ return;`
`1479`	`1480`	`}`
`1480`	`1481`	`//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));`
`1481`	`1482`	`if(m_progressBars[m_playerLookup[playerId]])`
`@@ -1843,6 +1844,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)`
`1843`	`1844`	`if( percentage < 0 \|\| percentage > 100 \|\| playerId >= MAX_SLOTS \|\| playerId < 0 \|\| m_playerLookup[playerId] == -1)`
`1844`	`1845`	`{`
`1845`	`1846`	`DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));`
	`1847`	`+ return;`
`1846`	`1848`	`}`
`1847`	`1849`	`//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));`
`1848`	`1850`	`if(m_progressBars[m_playerLookup[playerId]])`
`@@ -1995,6 +1997,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS`
`1995`	`1997`	`if( percentage < 0 \|\| percentage > 100 \|\| playerId >= MAX_SLOTS \|\| playerId < 0 \|\| m_playerLookup[playerId] == -1)`
`1996`	`1998`	`{`
`1997`	`1999`	`DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));`
	`2000`	`+ return;`
`1998`	`2001`	`}`
`1999`	`2002`
`2000`	`2003`	`if (m_oldProgress[playerId] == percentage)`