From 018f8be3d549a70173f7d9f17a813b7c51a3055b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= <pedrojrulez@gmail.com>
Date: Wed, 11 Sep 2024 14:54:09 +0200
Subject: [PATCH] Object: Let debug lock handle callee destruction within call
 chain gracefully

Co-authored-by: lawnjelly <lawnjelly@gmail.com>
(cherry picked from commit 10e2318bdeccdc33f95ebdb2c7683b816dda67fb)
---
 core/object/object.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/object/object.cpp b/core/object/object.cpp
index bf24c3a7924..3f5378b7f68 100644
--- a/core/object/object.cpp
+++ b/core/object/object.cpp
@@ -45,14 +45,17 @@
 #ifdef DEBUG_ENABLED
 
 struct _ObjectDebugLock {
-	Object *obj;
+	ObjectID obj_id;
 
 	_ObjectDebugLock(Object *p_obj) {
-		obj = p_obj;
-		obj->_lock_index.ref();
+		obj_id = p_obj->get_instance_id();
+		p_obj->_lock_index.ref();
 	}
 	~_ObjectDebugLock() {
-		obj->_lock_index.unref();
+		Object *obj_ptr = ObjectDB::get_instance(obj_id);
+		if (likely(obj_ptr)) {
+			obj_ptr->_lock_index.unref();
+		}
 	}
 };