RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

collide: Fix CollisionNode owner crash (grab GIL when destructing)

This commit is contained in:
rdb 2025-04-15 10:44:33 +02:00
parent 5435579567
commit eae39b339c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/collide/collisionNode_ext.cxx
View File

@ -53,7 +53,17 @@ void Extension<CollisionNode>::
set_owner(PyObject *owner) {
if (owner != Py_None) {
PyObject *ref = PyWeakref_NewRef(owner, nullptr);
_this->set_owner(ref, [](void *obj) { Py_DECREF((PyObject *)obj); });
_this->set_owner(ref, [](void *obj) {
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
// Use PyGILState to protect this asynchronous call.
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
#endif
Py_DECREF((PyObject *)obj);
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
PyGILState_Release(gstate);
#endif
});
} else {
_this->clear_owner();
}