bugfix(contain): Prevent undefined behaviour when a dead unit enters a container (TheSuperHackers#2258)

Author: Stubbjax

Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp

@@ -278,6 +278,12 @@ void OpenContain::addToContain( Object *rider )
 	if( rider == nullptr )
 		return;
 
+	// TheSuperHackers @bugfix Stubbjax 06/02/2026 Ensure the rider is not destroyed to prevent a
+	// likely crash if it enters the container on the same frame. If this occurs with an unpatched
+	// client present in a match, the game has a small chance to mismatch.
+	if (rider->isDestroyed())
+		return;
+
 #if defined(RTS_DEBUG)
 	if( !isValidContainerFor( rider, false ) )
 	{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp

@@ -293,6 +293,12 @@ void OpenContain::addToContain( Object *rider )
 	if( rider == nullptr )
 		return;
 
+	// TheSuperHackers @bugfix Stubbjax 06/02/2026 Ensure the rider is not destroyed to prevent a
+	// likely crash if it enters the container on the same frame. If this occurs with an unpatched
+	// client present in a match, the game has a small chance to mismatch.
+	if (rider->isDestroyed())
+		return;
+
 	Drawable *riderDraw = rider->getDrawable();
 	Bool wasSelected = FALSE;
 	if( riderDraw && riderDraw->isSelected() )