summaryrefslogtreecommitdiffstats
path: root/core/object
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-09-16 13:35:06 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-09-16 13:35:06 +0200
commitf7daa0fb2f916e4385dad857478d1597e28c801d (patch)
tree835c737cfa5f2dbb5fabb1406bcf86eccc8aa640 /core/object
parent08c5ce1d9cac88b580c26b30b941e7ee5c0c1f87 (diff)
parentbb7752059966b38f75714914474da1b9f93dc294 (diff)
downloadredot-engine-f7daa0fb2f916e4385dad857478d1597e28c801d.tar.gz
Merge pull request #96856 from RandomShaper/selfdestruct_correctness
Object: Let debug lock handle callee destruction within call chain gracefully
Diffstat (limited to 'core/object')
-rw-r--r--core/object/object.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp
index 000d5328b4..da3ca6bc61 100644
--- a/core/object/object.cpp
+++ b/core/object/object.cpp
@@ -44,14 +44,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();
+ }
}
};