Skip to content

Use XSETREF for safety #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2023
Merged

Use XSETREF for safety #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions src/PythonQtObjectPtr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@

#include <PythonQt.h>

#ifndef Py_XSETREF // Some Python2, but not the latest one
#define Py_XSETREF(op1, op2) \
do { \
auto **op = &(op1); \
PyObject *tmp = static_cast<PyObject *>(*op); \
*op = (op2); \
Py_XDECREF(tmp); \
} while (0)
#endif

QVariant PythonQtObjectPtr::evalScript(const QString& script, int start)
{
return PythonQt::self()->evalScript(_object, script, start);
Expand Down Expand Up @@ -89,8 +99,8 @@ QVariant PythonQtObjectPtr::call(const QVariantList& args, const QVariantMap& kw

PythonQtObjectPtr::PythonQtObjectPtr(PyObject* o)
{
Py_XINCREF(o);
_object = o;
if (o) Py_INCREF(_object);
}

PythonQtObjectPtr::PythonQtObjectPtr(PythonQtSafeObjectPtr &&p) :_object(p.takeObject())
Expand All @@ -99,14 +109,13 @@ PythonQtObjectPtr::PythonQtObjectPtr(PythonQtSafeObjectPtr &&p) :_object(p.takeO

PythonQtObjectPtr::~PythonQtObjectPtr()
{
if (_object) Py_DECREF(_object);
Py_XDECREF(_object);
}

void PythonQtObjectPtr::setNewRef(PyObject* o)
{
if (o != _object) {
if (_object) Py_DECREF(_object);
_object = o;
Py_XSETREF(_object, o);
}
}

Expand Down Expand Up @@ -136,19 +145,15 @@ QVariant PythonQtObjectPtr::toVariant()

PythonQtObjectPtr & PythonQtObjectPtr::operator=(PythonQtSafeObjectPtr &&p)
{
if (_object) {
setObject(nullptr);
}
_object = p.takeObject();
Py_XSETREF(_object, p.takeObject());
return *this;
}

void PythonQtObjectPtr::setObject(PyObject* o)
{
if (o != _object) {
if (_object) Py_DECREF(_object);
_object = o;
if (_object) Py_INCREF(_object);
Py_XINCREF(o);
Py_XSETREF(_object, o);
}
}

Expand All @@ -159,7 +164,7 @@ PythonQtSafeObjectPtr::PythonQtSafeObjectPtr(PyObject* o)
_object = o;
if (o) {
PYTHONQT_GIL_SCOPE
Py_INCREF(_object);
Py_INCREF(o);
}
}

Expand All @@ -175,18 +180,16 @@ void PythonQtSafeObjectPtr::setObject(PyObject* o)
{
if (o != _object) {
PYTHONQT_GIL_SCOPE
if (_object) Py_DECREF(_object);
_object = o;
if (_object) Py_INCREF(_object);
Py_XINCREF(o);
Py_XSETREF(_object, o);
}
}

void PythonQtSafeObjectPtr::setObjectUnsafe(PyObject* o)
{
if (o != _object) {
if (_object) Py_DECREF(_object);
_object = o;
if (_object) Py_INCREF(_object);
Py_XINCREF(o);
Py_XSETREF(_object, o);
}
}

Expand Down