20987: Fixes deadlock when calling (clone_entities (null) (null)) (#182)

howsoai · Jul 22, 2024 · 157e5ce · 157e5ce
1 parent f420547
commit 157e5ce
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Amalgam/interpreter/InterpreterOpcodesEntityControl.cpp b/src/Amalgam/interpreter/InterpreterOpcodesEntityControl.cpp
@@ -416,6 +416,12 @@ EvaluableNodeReference Interpreter::InterpretNode_ENT_CLONE_ENTITIES(EvaluableNo
 			continue;
 		}
 
+		//create new entity
+		Entity *new_entity = new Entity(source_entity);
+
+		//clear previous lock
+		source_entity = EntityReadReference();
+
 		//get destination if applicable
 		EntityWriteReference destination_entity_parent;
 		StringInternRef new_entity_id;
@@ -424,16 +430,11 @@ EvaluableNodeReference Interpreter::InterpretNode_ENT_CLONE_ENTITIES(EvaluableNo
 
 		if(destination_entity_parent == nullptr)
 		{
+			delete new_entity;
 			new_entity_ids_list->AppendOrderedChildNode(nullptr);
 			continue;
 		}
 
-		//create new entity
-		Entity *new_entity = new Entity(source_entity);
-
-		//clear previous lock
-		source_entity = EntityReadReference();
-
 		//accumulate usage
 		if(ConstrainedAllocatedNodes())
 			performanceConstraints->curNumAllocatedNodesAllocatedToEntities += new_entity->GetDeepSizeInNodes();