aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sources/shiboken6/libshiboken/basewrapper.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/sources/shiboken6/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp
index 1bcc27218..1447432e0 100644
--- a/sources/shiboken6/libshiboken/basewrapper.cpp
+++ b/sources/shiboken6/libshiboken/basewrapper.cpp
@@ -802,6 +802,10 @@ PyObject *Sbk_GetPyOverride(const void *voidThis, PyTypeObject *typeObject,
return nullptr;
gil.acquire();
+ if (resultCache == Py_None) { // PYSIDE 3246, some other thread may have determined the override
+ gil.release();
+ return nullptr;
+ }
if (resultCache != nullptr) // recreate the callable from function/self
return PepExt_Type_CallDescrGet(resultCache, pySelf, nullptr);