Object: Let debug lock handle callee destruction within call chain gr…

…acefully
RandomShaper · Sep 11, 2024 · 05e3c71 · 05e3c71
1 parent 97ef3c8
commit 05e3c71
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/object/object.cpp b/core/object/object.cpp
@@ -45,14 +45,18 @@
 #ifdef DEBUG_ENABLED
 
 struct _ObjectDebugLock {
-	Object *obj;
+	Variant obj;
 
 	_ObjectDebugLock(Object *p_obj) {
 		obj = p_obj;
-		obj->_lock_index.ref();
+		p_obj->_lock_index.ref();
 	}
 	~_ObjectDebugLock() {
-		obj->_lock_index.unref();
+		bool freed = false;
+		Object *obj_ptr = obj.get_validated_object_with_check(freed);
+		if (obj_ptr) {
+			obj_ptr->_lock_index.unref();
+		}
 	}
 };