diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-09-10 15:57:56 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-09-10 15:58:02 +0300 |
commit | 0467ff4053440982b70866a2868d8664c4ddc5a6 (patch) | |
tree | afe55e11082fc97755c56549a8a4a46243882143 /source | |
parent | ca39aff59d45e15297a25895f6963e134894aad4 (diff) |
Python: extra check on `BPY_thread_save()` to ensure proper GIL handling
Use `_PyThreadState_UncheckedGet()` to check that the current thread is
tracked by Python before checking whether it has the GIL. The latter
will abort when the former is false.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/python/generic/bpy_threads.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/python/generic/bpy_threads.c b/source/blender/python/generic/bpy_threads.c index 54548b88d4f..8aa8c5c5d92 100644 --- a/source/blender/python/generic/bpy_threads.c +++ b/source/blender/python/generic/bpy_threads.c @@ -29,9 +29,12 @@ /* analogue of PyEval_SaveThread() */ BPy_ThreadStatePtr BPY_thread_save(void) { - /* Don't use `PyThreadState_Get()`, to avoid a fatal error issued when a thread state is NULL - * (the thread state can be NULL when quitting Blender). */ - if (PyGILState_Check()) { + /* Use `_PyThreadState_UncheckedGet()` instead of `PyThreadState_Get()`, to avoid a fatal error + * issued when a thread state is NULL (the thread state can be NULL when quitting Blender). + * + * `PyEval_SaveThread()` will release the GIL, so this thread has to have the GIL to begin with + * or badness will ensue. */ + if (_PyThreadState_UncheckedGet() && PyGILState_Check()) { return (BPy_ThreadStatePtr)PyEval_SaveThread(); } return NULL; |