[GEN][ZH] Prevent dereferencing NULL pointer 'damageSource' in TransitionDamageFX::onBodyDamageStateChange() (#1140)

xezon · web-flow · commit 264de8db656f · 2025-06-22T08:51:20.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
@@ -363,7 +363,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 			}  // end if
 					
 			// do any object creation list for our new state
-			if( modData->m_OCL[ newState ][ i ].ocl )
+			if( damageSource && modData->m_OCL[ newState ][ i ].ocl )
 			{
 
 				if( lastDamageInfo == NULL || 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
@@ -366,7 +366,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 			}  // end if
 					
 			// do any object creation list for our new state
-			if( modData->m_OCL[ newState ][ i ].ocl )
+			if( damageSource && modData->m_OCL[ newState ][ i ].ocl )
 			{
 
 				if( lastDamageInfo == NULL || 

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,`
`363`	`363`	`} // end if`
`364`	`364`
`365`	`365`	`// do any object creation list for our new state`
`366`		`- if( modData->m_OCL[ newState ][ i ].ocl )`
	`366`	`+ if( damageSource && modData->m_OCL[ newState ][ i ].ocl )`
`367`	`367`	`{`
`368`	`368`
`369`	`369`	`if( lastDamageInfo == NULL \|\|`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,`
`366`	`366`	`} // end if`
`367`	`367`
`368`	`368`	`// do any object creation list for our new state`
`369`		`- if( modData->m_OCL[ newState ][ i ].ocl )`
	`369`	`+ if( damageSource && modData->m_OCL[ newState ][ i ].ocl )`
`370`	`370`	`{`
`371`	`371`
`372`	`372`	`if( lastDamageInfo == NULL \|\|`