diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-03-28 09:40:39 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-28 22:06:20 +0000 |
| commit | 1a9476d67d2253d1d43a479803fa297bf470f253 (patch) | |
| tree | caa04696e5c1237f56e0c0b732b33bd346454104 | |
| parent | 3be79ef413e53c46378ce258e5ae823d8b47dc22 (diff) | |
Fix endless recursion querying __doc__ of a property
Add a check for None
Fixes: PYSIDE-1874
Change-Id: I0127ba77ef2017dae232f2a1db1410d9cfe62405
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 370e5c712cafb1ff3ca22cc1f9794904f6d7a14a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/libpyside/pysideproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside6/libpyside/pysideproperty.cpp b/sources/pyside6/libpyside/pysideproperty.cpp index fcdc2647e..98338a1f2 100644 --- a/sources/pyside6/libpyside/pysideproperty.cpp +++ b/sources/pyside6/libpyside/pysideproperty.cpp @@ -359,7 +359,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()) |