From 070ca71cdf43bee931576cc7e91056fb9bac81df Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 28 Mar 2022 09:40:39 +0200 Subject: Fix endless recursion querying __doc__ of a property Add a check for None Fixes: PYSIDE-1874 Change-Id: I0127ba77ef2017dae232f2a1db1410d9cfe62405 Reviewed-by: Shyamnath Premnadh Reviewed-by: Cristian Maureira-Fredes (cherry picked from commit 370e5c712cafb1ff3ca22cc1f9794904f6d7a14a) --- sources/pyside2/libpyside/pysideproperty.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/pyside2/libpyside/pysideproperty.cpp') diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp index cd87c1e1b..f929f085e 100644 --- a/sources/pyside2/libpyside/pysideproperty.cpp +++ b/sources/pyside2/libpyside/pysideproperty.cpp @@ -355,7 +355,7 @@ static PyObject *qPropertyDocGet(PyObject *self, void *) if (pData->fget != nullptr) { // PYSIDE-1019: Fetch the default `__doc__` from fget. We do it late. AutoDecRef get_doc(PyObject_GetAttr(pData->fget, PyMagicName::doc())); - if (!get_doc.isNull()) { + if (!get_doc.isNull() && get_doc.object() != Py_None) { pData->doc = String::toCString(get_doc); pData->getter_doc = true; if (Py_TYPE(self) == PySidePropertyTypeF()) -- cgit v1.2.3