summaryrefslogtreecommitdiffstats
path: root/Modules/_testmultiphase.c
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2015-06-04 11:52:57 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2015-06-04 11:52:57 (GMT)
commit53f95024d7ef25a39e70aa45ffdcefbb084821ed (patch)
treecbb1b3e934a59b2912ce172cc00bb467c56313c4 /Modules/_testmultiphase.c
parent4fabf02633f7f537a8318a7541eec02cb3338a0d (diff)
downloadcpython-53f95024d7ef25a39e70aa45ffdcefbb084821ed.zip
cpython-53f95024d7ef25a39e70aa45ffdcefbb084821ed.tar.gz
cpython-53f95024d7ef25a39e70aa45ffdcefbb084821ed.tar.bz2
Issue #24373: Eliminate PEP 489 test refleaks
_testmultiphase and xxlimited now use tp_traverse and tp_finalize to avoid reference leaks encountered when combining tp_dealloc with PyType_FromSpec (see issue #16690 for details)
Diffstat (limited to 'Modules/_testmultiphase.c')
-rw-r--r--Modules/_testmultiphase.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c
index 7b98be2..2919687 100644
--- a/Modules/_testmultiphase.c
+++ b/Modules/_testmultiphase.c
@@ -12,11 +12,18 @@ typedef struct {
/* Example methods */
-static void
-Example_dealloc(ExampleObject *self)
+static int
+Example_traverse(ExampleObject *self, visitproc visit, void *arg)
{
- Py_XDECREF(self->x_attr);
- PyObject_Del(self);
+ Py_VISIT(self->x_attr);
+ return 0;
+}
+
+static int
+Example_finalize(ExampleObject *self)
+{
+ Py_CLEAR(self->x_attr);
+ return 0;
}
static PyObject *
@@ -74,7 +81,8 @@ Example_setattr(ExampleObject *self, char *name, PyObject *v)
static PyType_Slot Example_Type_slots[] = {
{Py_tp_doc, "The Example type"},
- {Py_tp_dealloc, Example_dealloc},
+ {Py_tp_finalize, Example_finalize},
+ {Py_tp_traverse, Example_traverse},
{Py_tp_getattro, Example_getattro},
{Py_tp_setattr, Example_setattr},
{Py_tp_methods, Example_methods},
@@ -85,7 +93,7 @@ static PyType_Spec Example_Type_spec = {
"_testimportexec.Example",
sizeof(ExampleObject),
0,
- Py_TPFLAGS_DEFAULT,
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_FINALIZE,
Example_Type_slots
};