[GEN][ZH] Fix undefined behavior in ThingTemplate::isEquivalentTo (#932)

Caball009 · web-flow · commit 808017eeffba · 2025-07-12T18:11:47.000+02:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -1090,7 +1090,9 @@ class PartitionFilterThing : public PartitionFilter
 	Bool  m_match;
 
 public:
-	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {}
+	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {
+		DEBUG_ASSERTCRASH(m_tThing != NULL, ("ThingTemplate for PartitionFilterThing is NULL"));
+	}
 protected:
 	virtual Bool allow( Object *other );
 #if defined(RTS_DEBUG)
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
@@ -174,7 +174,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )
 	for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)
 	{
 		const ThingTemplate *theTemplate = it->first;
-		if (theTemplate->isEquivalentTo(pTemplate))
+		if (theTemplate && theTemplate->isEquivalentTo(pTemplate))
 			++count;
 	}
 	return count;
diff --git a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
@@ -1218,9 +1218,8 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 		// get this button
 		commandButton = commandSet->getCommandButton(i);
 		if( commandButton &&
-				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD ||
-				 commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
-				commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
+				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD || commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
+				commandButton->getThingTemplate() && commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
 			foundCommand = commandButton;
 
 	}  // end for i
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
@@ -1319,7 +1319,7 @@ const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName
 Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 {
 	// sanity
-	if (!(this && tt)) 
+	if (!tt)
 		return false;
 
 	// sanity
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -232,7 +232,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				}
 			}
 		}
-		if (powerPlan && powerInfo && !powerPlan->isEquivalentTo(bldgPlan)) {
+		if (powerInfo && powerPlan && !powerPlan->isEquivalentTo(bldgPlan)) {
 			if (!powerUnderConstruction) {
 				bldgPlan = powerPlan;
 				bldgInfo = powerInfo;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -1738,7 +1738,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					if (beacon)
 					{
 						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
-						if (thing->isEquivalentTo(beacon->getTemplate()))
+						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
 							{
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -1127,7 +1127,9 @@ class PartitionFilterThing : public PartitionFilter
 	Bool  m_match;
 
 public:
-	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {}
+	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {
+		DEBUG_ASSERTCRASH(m_tThing != NULL, ("ThingTemplate for PartitionFilterThing is NULL"));
+	}
 protected:
 	virtual Bool allow( Object *other );
 #if defined(RTS_DEBUG)
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -1377,7 +1377,7 @@ static void doFindMostReadyWeaponForThing( Object *obj, void *userData )
 		return;
 	}
 	
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
 		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
 				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
@@ -1409,7 +1409,7 @@ static void doFindMostReadySpecialPowerForThing( Object *obj, void *userData )
 		return;
 	}
 	
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
 		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
 				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
@@ -1445,7 +1445,7 @@ static void doFindExistingObjectWithThingTemplate( Object *obj, void *userData )
 		return;
 	}
 	
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
 		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
 				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
@@ -2863,7 +2863,7 @@ static void countExisting( Object *obj, void *userData )
   TypeCountData *typeCountData = (TypeCountData *)userData;
   
   // Compare templates
-  if ( typeCountData->type->isEquivalentTo( obj->getTemplate() ) ||
+  if ( ( typeCountData->type && typeCountData->type->isEquivalentTo( obj->getTemplate() ) ) ||
        ( typeCountData->linkKey != NAMEKEY_INVALID && obj->getTemplate() != NULL && typeCountData->linkKey == obj->getTemplate()->getMaxSimultaneousLinkKey() ) )
   {
     typeCountData->count++;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
@@ -174,7 +174,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )
 	for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)
 	{
 		const ThingTemplate *theTemplate = it->first;
-		if (theTemplate->isEquivalentTo(pTemplate))
+		if (theTemplate && theTemplate->isEquivalentTo(pTemplate))
 			++count;
 	}
 	return count;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
@@ -1271,9 +1271,8 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 		// get this button
 		commandButton = commandSet->getCommandButton(i);
 		if( commandButton &&
-				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD ||
-				 commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
-				commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
+				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD || commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
+				commandButton->getThingTemplate() && commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
 			foundCommand = commandButton;
 
 	}  // end for i
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
@@ -1474,7 +1474,7 @@ UnsignedInt ThingTemplate::getMaxSimultaneousOfType() const
 Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 {
 	// sanity
-	if (!(this && tt)) 
+	if (!tt)
 		return false;
 
 	// sanity
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -239,7 +239,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				}
 			}
 		}
-		if (powerPlan && powerInfo && !powerPlan->isEquivalentTo(bldgPlan)) {
+		if (powerInfo && powerPlan && !powerPlan->isEquivalentTo(bldgPlan)) {
 			if (!powerUnderConstruction) {
 				bldgPlan = powerPlan;
 				bldgInfo = powerInfo;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp
@@ -170,7 +170,7 @@ Bool RiderChangeContain::isValidContainerFor(const Object* rider, Bool checkCapa
 		for( int i = 0; i < MAX_RIDERS; i++ )
 		{
 			const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-			if( thing->isEquivalentTo( rider->getTemplate() ) )
+			if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 			{
 				//We found a valid rider, so return success.
 				return TRUE;
@@ -211,7 +211,7 @@ void RiderChangeContain::onContaining( Object *rider, Bool wasSelected )
 	for( int i = 0; i < MAX_RIDERS; i++ )
 	{
 		const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-		if( thing->isEquivalentTo( rider->getTemplate() ) )
+		if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 		{
 
 			//This is our rider, so set the correct model condition.
@@ -282,7 +282,7 @@ void RiderChangeContain::onRemoving( Object *rider )
 	for( int i = 0; i < MAX_RIDERS; i++ )
 	{
 		const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-		if( thing->isEquivalentTo( rider->getTemplate() ) )
+		if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 		{
 			//This is our rider, so clear the current model condition.
 			bike->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( data->m_riders[ i ].m_modelConditionFlagType, MODELCONDITION_DOOR_1_CLOSING ) );
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -1766,7 +1766,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					if (beacon)
 					{
 						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
-						if (thing->isEquivalentTo(beacon->getTemplate()))
+						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
 							{

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )`
`174`	`174`	`for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)`
`175`	`175`	`{`
`176`	`176`	`const ThingTemplate *theTemplate = it->first;`
`177`		`- if (theTemplate->isEquivalentTo(pTemplate))`
	`177`	`+ if (theTemplate && theTemplate->isEquivalentTo(pTemplate))`
`178`	`178`	`++count;`
`179`	`179`	`}`
`180`	`180`	`return count;`
Original file line number	Diff line number	Diff line change
`@@ -1319,7 +1319,7 @@ const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName`
`1319`	`1319`	`Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const`
`1320`	`1320`	`{`
`1321`	`1321`	`// sanity`
`1322`		`- if (!(this && tt))`
	`1322`	`+ if (!tt)`
`1323`	`1323`	`return false;`
`1324`	`1324`
`1325`	`1325`	`// sanity`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ void AISkirmishPlayer::processBaseBuilding( void )`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`
`235`		`- if (powerPlan && powerInfo && !powerPlan->isEquivalentTo(bldgPlan)) {`
	`235`	`+ if (powerInfo && powerPlan && !powerPlan->isEquivalentTo(bldgPlan)) {`
`236`	`236`	`if (!powerUnderConstruction) {`
`237`	`237`	`bldgPlan = powerPlan;`
`238`	`238`	`bldgInfo = powerInfo;`
Original file line number	Diff line number	Diff line change
`@@ -1738,7 +1738,7 @@ void GameLogic::logicMessageDispatcher( GameMessage msg, void userData )`
`1738`	`1738`	`if (beacon)`
`1739`	`1739`	`{`
`1740`	`1740`	`const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );`
`1741`		`- if (thing->isEquivalentTo(beacon->getTemplate()))`
	`1741`	`+ if (thing && thing->isEquivalentTo(beacon->getTemplate()))`
`1742`	`1742`	`{`
`1743`	`1743`	`if (beacon->getControllingPlayer() == thisPlayer)`
`1744`	`1744`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1377,7 +1377,7 @@ static void doFindMostReadyWeaponForThing( Object obj, void userData )`
`1377`	`1377`	`return;`
`1378`	`1378`	`}`
`1379`	`1379`
`1380`		`- if( info->thing->isEquivalentTo( obj->getTemplate() ) )`
	`1380`	`+ if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )`
`1381`	`1381`	`{`
`1382`	`1382`	`if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )`
`1383`	`1383`	`&& !obj->testStatus( OBJECT_STATUS_SOLD )`
`@@ -1409,7 +1409,7 @@ static void doFindMostReadySpecialPowerForThing( Object obj, void userData )`
`1409`	`1409`	`return;`
`1410`	`1410`	`}`
`1411`	`1411`
`1412`		`- if( info->thing->isEquivalentTo( obj->getTemplate() ) )`
	`1412`	`+ if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )`
`1413`	`1413`	`{`
`1414`	`1414`	`if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )`
`1415`	`1415`	`&& !obj->testStatus( OBJECT_STATUS_SOLD )`
`@@ -1445,7 +1445,7 @@ static void doFindExistingObjectWithThingTemplate( Object obj, void userData )`
`1445`	`1445`	`return;`
`1446`	`1446`	`}`
`1447`	`1447`
`1448`		`- if( info->thing->isEquivalentTo( obj->getTemplate() ) )`
	`1448`	`+ if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )`
`1449`	`1449`	`{`
`1450`	`1450`	`if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )`
`1451`	`1451`	`&& !obj->testStatus( OBJECT_STATUS_SOLD )`
`@@ -2863,7 +2863,7 @@ static void countExisting( Object obj, void userData )`
`2863`	`2863`	`TypeCountData typeCountData = (TypeCountData )userData;`
`2864`	`2864`
`2865`	`2865`	`// Compare templates`
`2866`		`- if ( typeCountData->type->isEquivalentTo( obj->getTemplate() ) \|\|`
	`2866`	`+ if ( ( typeCountData->type && typeCountData->type->isEquivalentTo( obj->getTemplate() ) ) \|\|`
`2867`	`2867`	`( typeCountData->linkKey != NAMEKEY_INVALID && obj->getTemplate() != NULL && typeCountData->linkKey == obj->getTemplate()->getMaxSimultaneousLinkKey() ) )`
`2868`	`2868`	`{`
`2869`	`2869`	`typeCountData->count++;`