objmem: properly check for missing elements in freeAllEntitiesImpl

It's forbidden to invoke `.erase()` on the end iterator, so avoid calling the method by guarding this code path by a `continue` + `ASSERT` combination. Signed-off-by: Pavel Solodovnikov <[email protected]>
Warzone2100 · Sep 18, 2024 · 9f59a73 · 9f59a73
1 parent 9045591
commit 9f59a73
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/objmem.cpp b/src/objmem.cpp
@@ -589,7 +589,10 @@ static void freeAllEntitiesImpl(PerPlayerObjectLists<Entity, PlayerCount>& entit
 		for (auto* ent : list)
 		{
 			auto it = entityContainer.find(*ent);
-			ASSERT(it != entityContainer.end(), "%s not found in the global container!", Traits::entityName());
+			if (it == entityContainer.end()) {
+				ASSERT(false, "%s not found in the global container!", Traits::entityName());
+				continue;
+			}
 			entityContainer.erase(it);
 		}
 		list.clear();