Skip to content

Commit

Permalink
Object::call() prevent debug lock accessing dangling pointer
Browse files Browse the repository at this point in the history
Self deleting an object within a call was leading to crashes due to referencing freed memory, due to a raw pointer stored in the debug lock.

Co-authored-by: RandomShaper <pedrojrulez@gmail.com>
  • Loading branch information
lawnjelly and RandomShaper committed Sep 12, 2024
1 parent de2f0f1 commit 0ccd559
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions core/object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,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();
}
}
};

Expand Down

0 comments on commit 0ccd559

Please sign in to comment.