mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-19 10:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix bug caused by first decrefing, then increfing.

Browse source
This commit is contained in:
Georg Brandl 2006-08-04 06:03:53 +00:00
parent d856ce0a1f
commit 45381938e9
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/descrobject.c
View file

@ -1176,7 +1176,6 @@ static int
property_init(PyObject *self, PyObject *args, PyObject *kwds) property_init(PyObject *self, PyObject *args, PyObject *kwds)
{ {
PyObject *get = NULL, *set = NULL, *del = NULL, *doc = NULL; PyObject *get = NULL, *set = NULL, *del = NULL, *doc = NULL;
PyObject *get_doc = NULL;
static char *kwlist[] = {"fget", "fset", "fdel", "doc", 0}; static char *kwlist[] = {"fget", "fset", "fdel", "doc", 0};
propertyobject *gs = (propertyobject *)self; propertyobject *gs = (propertyobject *)self;
@ -1194,16 +1193,16 @@ property_init(PyObject *self, PyObject *args, PyObject *kwds)
/* if no docstring given and the getter has one, use that one */ /* if no docstring given and the getter has one, use that one */
if ((doc == NULL || doc == Py_None) && get != NULL && if ((doc == NULL || doc == Py_None) && get != NULL &&
PyObject_HasAttrString(get, "__doc__")) { PyObject_HasAttrString(get, "__doc__")) {
if (!(get_doc = PyObject_GetAttrString(get, "__doc__"))) doc = PyObject_GetAttrString(get, "__doc__");
if (doc == NULL)
return -1; return -1;
Py_DECREF(get_doc); /* it is INCREF'd again below */ } else {
doc = get_doc; Py_XINCREF(doc);
} }
Py_XINCREF(get); Py_XINCREF(get);
Py_XINCREF(set); Py_XINCREF(set);
Py_XINCREF(del); Py_XINCREF(del);
Py_XINCREF(doc);
gs->prop_get = get; gs->prop_get = get;
gs->prop_set = set; gs->prop_set = set;