summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorOren Milman <orenmn@gmail.com>2018-02-13 10:28:33 (GMT)
committerINADA Naoki <methane@users.noreply.github.com>2018-02-13 10:28:33 (GMT)
commitd019bc8319ea35e93bf4baa38098ff1b57cd3ee5 (patch)
treed9b927eba02059f8be8465d35b6969254b172b8e /Objects
parentaec7532ed3ccbd29d3429a3f375e25f956c44003 (diff)
downloadcpython-d019bc8319ea35e93bf4baa38098ff1b57cd3ee5.zip
cpython-d019bc8319ea35e93bf4baa38098ff1b57cd3ee5.tar.gz
cpython-d019bc8319ea35e93bf4baa38098ff1b57cd3ee5.tar.bz2
bpo-31787: Prevent refleaks when calling __init__() more than once (GH-3995)
Diffstat (limited to 'Objects')
-rw-r--r--Objects/descrobject.c8
-rw-r--r--Objects/funcobject.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index a253018..6014039 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1490,10 +1490,10 @@ property_init_impl(propertyobject *self, PyObject *fget, PyObject *fset,
Py_XINCREF(fdel);
Py_XINCREF(doc);
- self->prop_get = fget;
- self->prop_set = fset;
- self->prop_del = fdel;
- self->prop_doc = doc;
+ Py_XSETREF(self->prop_get, fget);
+ Py_XSETREF(self->prop_set, fset);
+ Py_XSETREF(self->prop_del, fdel);
+ Py_XSETREF(self->prop_doc, doc);
self->getter_doc = 0;
/* if no docstring given and the getter has one, use that one */
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index d376f9c..241685d 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -709,7 +709,7 @@ cm_init(PyObject *self, PyObject *args, PyObject *kwds)
if (!PyArg_UnpackTuple(args, "classmethod", 1, 1, &callable))
return -1;
Py_INCREF(callable);
- cm->cm_callable = callable;
+ Py_XSETREF(cm->cm_callable, callable);
return 0;
}
@@ -890,7 +890,7 @@ sm_init(PyObject *self, PyObject *args, PyObject *kwds)
if (!PyArg_UnpackTuple(args, "staticmethod", 1, 1, &callable))
return -1;
Py_INCREF(callable);
- sm->sm_callable = callable;
+ Py_XSETREF(sm->sm_callable, callable);
return 0;
}