Check for a nullptr/dead object in aiBestNearestTarget()

Warzone2100 · Feb 19, 2024 · 3ffdbff · 3ffdbff
1 parent 70eda32
commit 3ffdbff
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/ai.cpp b/src/ai.cpp
@@ -604,6 +604,11 @@ int aiBestNearestTarget(DROID *psDroid, BASE_OBJECT **ppsObj, int weapon_slot, i
 		BASE_OBJECT *friendlyObj = nullptr;
 		BASE_OBJECT *targetInQuestion = *gi;
 
+		if (targetInQuestion == nullptr || isDead(targetInQuestion))
+		{
+			continue;
+		}
+
 		/* This is a friendly unit, check if we can reuse its target */
 		if (aiCheckAlliances(targetInQuestion->player, psDroid->player))
 		{