From 82e9d146016da82c8fab15aacb05e627b5cc5281 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Tue, 1 Feb 2011 19:15:23 -0200 Subject: Fix bug 651 - "Calling disconnect() with no arguments causes segfault" --- libpyside/pysidesignal.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'libpyside') diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp index 71a8c00bc..7a2c8ae29 100644 --- a/libpyside/pysidesignal.cpp +++ b/libpyside/pysidesignal.cpp @@ -379,14 +379,14 @@ PyObject* signalInstanceGetItem(PyObject* self, PyObject* key) PyObject* signalInstanceDisconnect(PyObject* self, PyObject* args) { - PySideSignalInstance *source = reinterpret_cast(self); + PySideSignalInstance* source = reinterpret_cast(self); Shiboken::AutoDecRef pyArgs(PyList_New(0)); - PyObject *slot; - if PyTuple_Check(args) + PyObject* slot; + if (PyTuple_Check(args) && PyTuple_GET_SIZE(args)) slot = PyTuple_GET_ITEM(args, 0); else - slot = args; + slot = Py_None; bool match = false; if (slot->ob_type == &PySideSignalInstanceType) { @@ -407,6 +407,9 @@ PyObject* signalInstanceDisconnect(PyObject* self, PyObject* args) Shiboken::AutoDecRef signature(PySide::Signal::buildQtCompatible(source->d->signature)); PyList_Append(pyArgs, signature); + // disconnect all, so we need to use the c++ signature disconnect(qobj, signal, 0, 0) + if (slot == Py_None) + PyList_Append(pyArgs, slot); PyList_Append(pyArgs, slot); match = true; } @@ -414,7 +417,7 @@ PyObject* signalInstanceDisconnect(PyObject* self, PyObject* args) if (match) { Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs)); Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->d->source, "disconnect")); - return PyObject_CallObject(pyMethod, tupleArgs); + return PyObject_CallObject(pyMethod, tupleArgs); } return 0; -- cgit v1.2.3