Fix crash with linked entities in the delayed deletion list

Thanks to bsxf47 for tracking down the cause of the crash. Fixes: issue #908
arx · Oct 8, 2016 · dee85f8 · dee85f8
1 parent d075491
commit dee85f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp
@@ -279,6 +279,8 @@ res::path Entity::instancePath() const {
 
 void Entity::cleanReferences() {
 
+	ARX_INTERACTIVE_DestroyIOdelayedRemove(this);
+
 	if(DRAGINTER == this) {
 		Set_DragInter(NULL);
 	}

diff --git a/src/scene/Interactive.cpp b/src/scene/Interactive.cpp
@@ -2534,6 +2534,12 @@ void ARX_INTERACTIVE_DestroyIOdelayed(Entity * entity) {
 
 }
 
+void ARX_INTERACTIVE_DestroyIOdelayedRemove(Entity * entity) {
+	Entity * null = NULL;
+	// Remove the entity from the list but don't invalidate iterators
+	std::replace(toDestroy.begin(), toDestroy.end(), entity, null);
+}
+
 void ARX_INTERACTIVE_DestroyIOdelayedExecute() {
 	if(!toDestroy.empty()) {
 		LogDebug("executing delayed entity destruction");

diff --git a/src/scene/Interactive.h b/src/scene/Interactive.h
@@ -103,6 +103,7 @@ void PrepareIOTreatZone(long flag = 0);
 void LinkObjToMe(Entity * io, Entity * io2, const std::string & attach);
 
 void ARX_INTERACTIVE_DestroyIOdelayed(Entity * entity);
+void ARX_INTERACTIVE_DestroyIOdelayedRemove(Entity * entity);
 void ARX_INTERACTIVE_DestroyIOdelayedExecute();
 
 /* TODO remove