orderDroidBase: Fix possible crash if getModuleStat fails

Warzone2100 · Jul 17, 2023 · 1ce7aba · 1ce7aba
1 parent e816b67
commit 1ce7aba
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/order.cpp b/src/order.cpp
@@ -1530,8 +1530,9 @@ void orderDroidBase(DROID *psDroid, DROID_ORDER_DATA *psOrder)
 		{
 			break;
 		}
-		psDroid->order = DroidOrder(DORDER_BUILD, getModuleStat((STRUCTURE *)psOrder->psObj), psOrder->psObj->pos.xy(), 0);
-		ASSERT_OR_RETURN(, psDroid->order.psStats != nullptr, "should have found a module stats");
+		STRUCTURE_STATS *psStats = getModuleStat((STRUCTURE *)psOrder->psObj);
+		ASSERT_OR_RETURN(, psStats != nullptr, "should have found a module stats");
+		psDroid->order = DroidOrder(DORDER_BUILD, psStats, psOrder->psObj->pos.xy(), 0);
 		ASSERT_OR_RETURN(, !psDroid->order.psStats || psDroid->order.psStats->type != REF_DEMOLISH, "Cannot build demolition");
 		actionDroid(psDroid, DACTION_BUILD, psOrder->psObj->pos.x, psOrder->psObj->pos.y);
 		objTrace(psDroid->id, "Starting new upgrade of %s", psOrder->psStats ? getStatsName(psOrder->psStats) : "NULL");