[GEN][ZH] Prevent dereferencing NULL pointer 'button' in ScriptActions::doCameoFlash() (#1121)

xezon · web-flow · commit 896c0bc3219d · 2025-06-21T11:18:48.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -2551,6 +2551,7 @@ void ScriptActions::doCameoFlash(const AsciiString& name, Int timeInSeconds)
 	if( button == NULL )
 	{
 		DEBUG_CRASH(( "ScriptActions::doCameoFlash can't find AsciiString cameoflash" ));
+		return;
 	}
 
 	Int frames = LOGICFRAMES_PER_SECOND * timeInSeconds;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -2628,6 +2628,7 @@ void ScriptActions::doCameoFlash(const AsciiString& name, Int timeInSeconds)
 	if( button == NULL )
 	{
 		DEBUG_CRASH(( "ScriptActions::doCameoFlash can't find AsciiString cameoflash" ));
+		return;
 	}
 
 	Int frames = LOGICFRAMES_PER_SECOND * timeInSeconds;

Original file line number	Diff line number	Diff line change
`@@ -2551,6 +2551,7 @@ void ScriptActions::doCameoFlash(const AsciiString& name, Int timeInSeconds)`
`2551`	`2551`	`if( button == NULL )`
`2552`	`2552`	`{`
`2553`	`2553`	`DEBUG_CRASH(( "ScriptActions::doCameoFlash can't find AsciiString cameoflash" ));`
	`2554`	`+ return;`
`2554`	`2555`	`}`
`2555`	`2556`
`2556`	`2557`	`Int frames = LOGICFRAMES_PER_SECOND * timeInSeconds;`
Original file line number	Diff line number	Diff line change
`@@ -2628,6 +2628,7 @@ void ScriptActions::doCameoFlash(const AsciiString& name, Int timeInSeconds)`
`2628`	`2628`	`if( button == NULL )`
`2629`	`2629`	`{`
`2630`	`2630`	`DEBUG_CRASH(( "ScriptActions::doCameoFlash can't find AsciiString cameoflash" ));`
	`2631`	`+ return;`
`2631`	`2632`	`}`
`2632`	`2633`
`2633`	`2634`	`Int frames = LOGICFRAMES_PER_SECOND * timeInSeconds;`