jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix memory corruption caused by tuple processing loop.

Browse source
This commit is contained in:
Luciano Wolf 2009-12-17 15:44:09 -03:00
commit 742d46f23f
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libpyside/signalslotconnection.cpp
View file

@ -60,20 +60,25 @@ SignalSlotConnection::~SignalSlotConnection()
void SignalSlotConnection::trigger(PyObject* args) void SignalSlotConnection::trigger(PyObject* args)
{ {
Q_ASSERT(PySequence_Size(args) >= m_numSlotArgs); Q_ASSERT(PySequence_Size(args) >= m_numSlotArgs);
const int useSelf = m_receiver ? 1 : 0;
PyObject* preparedArgs = PyTuple_New(m_numSlotArgs); const int useSelf = m_receiver ? 1 : 0;
int numSlotArgs = m_numSlotArgs;
if (numSlotArgs == -1)
numSlotArgs = PySequence_Size(args) + useSelf;
PyObject* preparedArgs = PyTuple_New(numSlotArgs);
if (m_receiver) if (m_receiver)
PyTuple_SetItem(preparedArgs, 0, m_receiver); PyTuple_SetItem(preparedArgs, 0, m_receiver);
for (int i = 0; i < m_numSlotArgs; ++i) for (int i = 0, max = numSlotArgs - useSelf; i < max; ++i) {
PyTuple_SET_ITEM(preparedArgs, i + useSelf, PyTuple_GET_ITEM(args, i)); PyTuple_SET_ITEM(preparedArgs, i + useSelf, PyTuple_GET_ITEM(args, i));
}
PyObject* retval = PyObject_CallObject(m_function, preparedArgs); PyObject* retval = PyObject_CallObject(m_function, preparedArgs);
if (retval) { if (retval) {
Py_DECREF(retval); Py_DECREF(retval);
} else { } else {
qWarning(qPrintable(QString("Error calling slot ")+ qWarning("Error calling slot");
PyString_AS_STRING(reinterpret_cast<PyCodeObject*>(PyFunction_GET_CODE(m_function))->co_name)));
} }
Py_DECREF(preparedArgs); Py_DECREF(preparedArgs);
} }