[GEN][ZH] Prevent dereferencing NULL pointer 'theTemplate' in UpgradeMuxData::getUpgradeActivationMasks() (#1141)

xezon · web-flow · commit 61cbc6f3c686 · 2025-06-22T09:07:17.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp b/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp
@@ -261,9 +261,9 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -275,11 +275,12 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
+
 			m_conflictingMask.set( theTemplate->getUpgradeMask() );
 		}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp
@@ -257,9 +257,9 @@ void UpgradeMuxData::muxDataProcessUpgradeRemoval(Object* obj) const
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -299,9 +299,9 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -313,11 +313,12 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
+
 			m_conflictingMask.set( theTemplate->getUpgradeMask() );
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -261,9 +261,9 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr`
`261`	`261`	`it++)`
`262`	`262`	`{`
`263`	`263`	`const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );`
`264`		`- if( !theTemplate && !it->isEmpty() && !it->isNone())`
	`264`	`+ if( !theTemplate )`
`265`	`265`	`{`
`266`		`- DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));`
	`266`	`+ DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));`
`267`	`267`	`throw INI_INVALID_DATA;`
`268`	`268`	`}`
`269`	`269`
`@@ -275,11 +275,12 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr`
`275`	`275`	`it++)`
`276`	`276`	`{`
`277`	`277`	`const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );`
`278`		`- if( !theTemplate && !it->isEmpty() && !it->isNone())`
	`278`	`+ if( !theTemplate )`
`279`	`279`	`{`
`280`		`- DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));`
	`280`	`+ DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));`
`281`	`281`	`throw INI_INVALID_DATA;`
`282`	`282`	`}`
	`283`	`+`
`283`	`284`	`m_conflictingMask.set( theTemplate->getUpgradeMask() );`
`284`	`285`	`}`
`285`	`286`
Original file line number	Diff line number	Diff line change
`@@ -257,9 +257,9 @@ void UpgradeMuxData::muxDataProcessUpgradeRemoval(Object* obj) const`
`257`	`257`	`it++)`
`258`	`258`	`{`
`259`	`259`	`const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );`
`260`		`- if( !theTemplate && !it->isEmpty() && !it->isNone())`
	`260`	`+ if( !theTemplate )`
`261`	`261`	`{`
`262`		`- DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));`
	`262`	`+ DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));`
`263`	`263`	`throw INI_INVALID_DATA;`
`264`	`264`	`}`
`265`	`265`
`@@ -299,9 +299,9 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr`
`299`	`299`	`it++)`
`300`	`300`	`{`
`301`	`301`	`const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );`
`302`		`- if( !theTemplate && !it->isEmpty() && !it->isNone())`
	`302`	`+ if( !theTemplate )`
`303`	`303`	`{`
`304`		`- DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));`
	`304`	`+ DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));`
`305`	`305`	`throw INI_INVALID_DATA;`
`306`	`306`	`}`
`307`	`307`
`@@ -313,11 +313,12 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr`
`313`	`313`	`it++)`
`314`	`314`	`{`
`315`	`315`	`const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );`
`316`		`- if( !theTemplate && !it->isEmpty() && !it->isNone())`
	`316`	`+ if( !theTemplate )`
`317`	`317`	`{`
`318`		`- DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));`
	`318`	`+ DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));`
`319`	`319`	`throw INI_INVALID_DATA;`
`320`	`320`	`}`
	`321`	`+`
`321`	`322`	`m_conflictingMask.set( theTemplate->getUpgradeMask() );`
`322`	`323`	`}`
`323`	`324`