diff options
| author | Kyle Altendorf <sda@fstab.net> | 2021-07-20 14:42:33 -0400 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2021-10-29 11:51:45 +0200 |
| commit | e9b29a35eb483b19dc3fac7c815d87a3afacdcfd (patch) | |
| tree | 6441884f36702d85befea692f22823f6ea29a072 /sources/pyside6/libpyside/pysidesignal.cpp | |
| parent | 07f9b2b674aca4f1d7b5f81ce25e1db08b165249 (diff) | |
Fix equality test for inherited signals
The signal initialization code didn't walk the MRO so it only caught
directly defined signals, not inherited signals. Walking the MRO
to find all signals resolves this issue.
Fixes: PYSIDE-1431
Pick-to: 6.2
Change-Id: Iadba9760e81f88478da4f3ac30e9885c4f568df5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pysidesignal.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pysidesignal.cpp | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp index 2a8635666..78f4d2a89 100644 --- a/sources/pyside6/libpyside/pysidesignal.cpp +++ b/sources/pyside6/libpyside/pysidesignal.cpp @@ -742,21 +742,38 @@ bool checkInstanceType(PyObject *pyObj) void updateSourceObject(PyObject *source) { - PyTypeObject *objType = reinterpret_cast<PyTypeObject *>(PyObject_Type(source)); + // TODO: Provide for actual upstream exception handling. + // For now we'll just return early to avoid further issues. - Py_ssize_t pos = 0; - PyObject *value; - PyObject *key; + if (source == nullptr) // Bad input + return; - while (PyDict_Next(objType->tp_dict, &pos, &key, &value)) { - if (PyObject_TypeCheck(value, PySideSignalTypeF())) { - Shiboken::AutoDecRef signalInstance(reinterpret_cast<PyObject *>(PyObject_New(PySideSignalInstance, PySideSignalInstanceTypeF()))); - instanceInitialize(signalInstance.cast<PySideSignalInstance *>(), key, reinterpret_cast<PySideSignal *>(value), source, 0); - PyObject_SetAttr(source, key, signalInstance); + Shiboken::AutoDecRef mroIterator(PyObject_GetIter(source->ob_type->tp_mro)); + + if (mroIterator.isNull()) // Not iterable + return; + + Shiboken::AutoDecRef mroItem{}; + + while ((mroItem.reset(PyIter_Next(mroIterator))), mroItem.object()) { + Py_ssize_t pos = 0; + PyObject *key, *value; + auto *type = reinterpret_cast<PyTypeObject *>(mroItem.object()); + + while (PyDict_Next(type->tp_dict, &pos, &key, &value)) { + if (PyObject_TypeCheck(value, PySideSignalTypeF())) { + auto *inst = PyObject_New(PySideSignalInstance, PySideSignalInstanceTypeF()); + Shiboken::AutoDecRef signalInstance(reinterpret_cast<PyObject *>(inst)); + instanceInitialize(signalInstance.cast<PySideSignalInstance *>(), + key, reinterpret_cast<PySideSignal *>(value), source, 0); + if (PyObject_SetAttr(source, key, signalInstance) == -1) + return; // An error occurred while setting the attribute + } } } - Py_XDECREF(objType); + if (PyErr_Occurred()) // An iteration error occurred + return; } QByteArray getTypeName(PyObject *obType) |