Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 06:03:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #96862 from lawnjelly/selfdestruct_correctness
Some checks failed
🔗 GHA / 📊 Static (push) Has been cancelled
Details
🔗 GHA / 🤖 Android (push) Has been cancelled
Details
🔗 GHA / 🍏 iOS (push) Has been cancelled
Details
🔗 GHA / 🌐 JavaScript (push) Has been cancelled
Details
🔗 GHA / 🐧 Linux (push) Has been cancelled
Details
🔗 GHA / 🍎 macOS (push) Has been cancelled
Details
🔗 GHA / ☁ Server (push) Has been cancelled
Details
🔗 GHA / 🏁 Windows (push) Has been cancelled
Details

Browse Source 
[3.x] `Object::call()` prevent debug lock accessing dangling pointer
This commit is contained in:
lawnjelly 2024-09-12 12:18:04 +01:00 committed by GitHub
commit 8c444fb9c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/object.cpp
View File

@ -43,14 +43,17 @@
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
struct _ObjectDebugLock { struct _ObjectDebugLock {
Object *obj; ObjectID obj_id;
_ObjectDebugLock(Object *p_obj) { _ObjectDebugLock(Object *p_obj) {
obj = p_obj; obj_id = p_obj->get_instance_id();
obj->_lock_index.ref(); p_obj->_lock_index.ref();
} }
~_ObjectDebugLock() { ~_ObjectDebugLock() {
obj->_lock_index.unref(); Object *obj_ptr = ObjectDB::get_instance(obj_id);
if (likely(obj_ptr)) {
obj_ptr->_lock_index.unref();
}
} }
}; };