droid.cpp: Fix DROID dtor segfault for transports

When a transport has some droids in it while its dtor is being called, the code that frees all droids in its transport group will segfault because each `delete psCurr` will modify the list and hence invalidate the current iterator. Signed-off-by: Pavel Solodovnikov <[email protected]>
Warzone2100 · Jan 6, 2024 · 42d3c12 · 42d3c12
1 parent 794aef9
commit 42d3c12
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/droid.cpp b/src/droid.cpp
@@ -443,14 +443,16 @@ DROID::~DROID()
 		if (psDroid->psGroup)
 		{
 			//free all droids associated with this Transporter
-			for (DROID* psCurr : psDroid->psGroup->psList)
+			mutating_list_iterate(psDroid->psGroup->psList, [psDroid](DROID* psCurr)
 			{
 				if (psCurr == psDroid)
 				{
-					break;
+					return IterationResult::BREAK_ITERATION;
 				}
+				// This will cause each droid to self-remove from `psGroup->psList`.
 				delete psCurr;
-			}
+				return IterationResult::CONTINUE_ITERATION;
+			});
 		}
 	}