mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-31787: Prevent refleaks when calling __init__() more than once (GH-3995)

Browse source
This commit is contained in:
Oren Milman 2018-02-13 12:28:33 +02:00 • committed by INADA Naoki
parent aec7532ed3
commit d019bc8319
13 changed files with 105 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/descrobject.c
View file

@ -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 */

4
Objects/funcobject.c
View file

@ -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;
}