mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Protect references to tp_descr_get and tp_dict with the appropriate test:

Browse Source 
PyType_HasFeature(t, Py_TPFLAGS_HAVE_CLASS).
This commit is contained in:
Guido van Rossum 2001-10-17 20:26:38 +00:00
parent 1f74cb3575
commit 915f0eb212
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Objects/classobject.c
View File

@ -4,6 +4,9 @@
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h"
#define TP_DESCR_GET(t) \
(PyType_HasFeature(t, Py_TPFLAGS_HAVE_CLASS) ? (t)->tp_descr_get : NULL)
/* Forward */ /* Forward */
static PyObject *class_lookup(PyClassObject *, PyObject *, static PyObject *class_lookup(PyClassObject *, PyObject *,
@ -232,7 +235,7 @@ class_getattr(register PyClassObject *op, PyObject *name)
PyString_AS_STRING(op->cl_name), sname); PyString_AS_STRING(op->cl_name), sname);
return NULL; return NULL;
} }
f = v->ob_type->tp_descr_get; f = TP_DESCR_GET(v->ob_type);
if (f == NULL) if (f == NULL)
Py_INCREF(v); Py_INCREF(v);
else else
@ -693,7 +696,7 @@ instance_getattr2(register PyInstanceObject *inst, PyObject *name)
v = class_lookup(inst->in_class, name, &class); v = class_lookup(inst->in_class, name, &class);
if (v != NULL) { if (v != NULL) {
Py_INCREF(v); Py_INCREF(v);
f = v->ob_type->tp_descr_get; f = TP_DESCR_GET(v->ob_type);
if (f != NULL) { if (f != NULL) {
PyObject *w = f(v, (PyObject *)inst, PyObject *w = f(v, (PyObject *)inst,
(PyObject *)(inst->in_class)); (PyObject *)(inst->in_class));
@ -2054,18 +2057,20 @@ instancemethod_getattro(PyObject *obj, PyObject *name)
{ {
PyMethodObject *im = (PyMethodObject *)obj; PyMethodObject *im = (PyMethodObject *)obj;
PyTypeObject *tp = obj->ob_type; PyTypeObject *tp = obj->ob_type;
PyObject *descr, *res; PyObject *descr = NULL, *res;
descrgetfunc f; descrgetfunc f = NULL;
if (tp->tp_dict == NULL) { if (PyType_HasFeature(tp, Py_TPFLAGS_HAVE_CLASS)) {
if (PyType_Ready(tp) < 0) if (tp->tp_dict == NULL) {
return NULL; if (PyType_Ready(tp) < 0)
return NULL;
}
descr = _PyType_Lookup(tp, name);
} }
descr = _PyType_Lookup(tp, name);
f = NULL; f = NULL;
if (descr != NULL) { if (descr != NULL) {
f = descr->ob_type->tp_descr_get; f = TP_DESCR_GET(descr->ob_type);
if (f != NULL && PyDescr_IsData(descr)) if (f != NULL && PyDescr_IsData(descr))
return f(descr, obj, (PyObject *)obj->ob_type); return f(descr, obj, (PyObject *)obj->ob_type);
} }