traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

slot_tp_descr_get(): guard against NULL obj or type (bug reported by 

Thomas Hellor on python-dev).

slot_tp_descr_set(): if value is NULL, call __del__ instead of
__set__.
This commit is contained in:
Guido van Rossum 2001-08-24 10:13:31 +00:00
parent 91c0d8a922
commit 2c25239215
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/typeobject.c
View File

@ -2806,14 +2806,23 @@ slot_tp_descr_get(PyObject *self, PyObject *obj, PyObject *type)
Py_INCREF(self);
return self;
}
if (obj == NULL)
obj = Py_None;
if (type == NULL)
type = Py_None;
return PyObject_CallFunction(get, "OOO", self, obj, type);
}
static int
slot_tp_descr_set(PyObject *self, PyObject *target, PyObject *value)
{
PyObject *res = PyObject_CallMethod(self, "__set__",
"OO", target, value);
PyObject *res;
if (value == NULL)
res = PyObject_CallMethod(self, "__del__", "O", target);
else
res = PyObject_CallMethod(self, "__set__",
"OO", target, value);
if (res == NULL)
return -1;
Py_DECREF(res);