From 17d2765592c78c782e35361e12008d541dee8dc9 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Wed, 17 Jun 2026 16:49:49 -0500
Subject: [PATCH] crashfix: make sure mShapeInstance is always assigned valid
 or NULL there were a couple code routes that could lead to mShapeInstance
 holding on to the old ram loc. used SAFE_DELETE preemptively to ensure that
 never happens.

---
 Engine/source/T3D/missionMarker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engine/source/T3D/missionMarker.cpp b/Engine/source/T3D/missionMarker.cpp
index 752e44971..b704e7144 100644
--- a/Engine/source/T3D/missionMarker.cpp
+++ b/Engine/source/T3D/missionMarker.cpp
@@ -471,7 +471,7 @@ void SpawnSphere::unpackUpdate(NetConnection * con, BitStream * stream)
       stream->read(&mSpawnDataBlock);
       if (oldSDB != mSpawnDataBlock)
       {
-         delete mShapeInstance;
+         SAFE_DELETE(mShapeInstance);
          ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str()));
          if (spawnedDatablock)
          {