summaryrefslogtreecommitdiffstats
path: root/Objects/descrobject.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-01 21:33:06 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-01 21:33:06 (GMT)
commit6a534e7e7b9820bcae40883d6158ec19887fceb3 (patch)
tree258214af864165f89c10d4dbd3443d5cb9728788 /Objects/descrobject.c
parent571e8fda9b6fdf2172ee071457d5f9e73fe4d70d (diff)
parentd9561318d849df12775d7a111aa85bbf62a54c0f (diff)
downloadcpython-6a534e7e7b9820bcae40883d6158ec19887fceb3.zip
cpython-6a534e7e7b9820bcae40883d6158ec19887fceb3.tar.gz
cpython-6a534e7e7b9820bcae40883d6158ec19887fceb3.tar.bz2
(Merge 3.2) Issue #9756: When calling a method descriptor or a slot wrapper
descriptor, the check of the object type doesn't read the __class__ attribute anymore. Fix a crash if a class override its __class__ attribute (e.g. a proxy of the str type).
Diffstat (limited to 'Objects/descrobject.c')
-rw-r--r--Objects/descrobject.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 11c68d3..93daefd 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -226,7 +226,8 @@ methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwds)
return NULL;
}
self = PyTuple_GET_ITEM(args, 0);
- if (!PyObject_IsInstance(self, (PyObject *)PyDescr_TYPE(descr))) {
+ if (!_PyObject_RealIsSubclass((PyObject *)Py_TYPE(self),
+ (PyObject *)PyDescr_TYPE(descr))) {
PyErr_Format(PyExc_TypeError,
"descriptor '%V' "
"requires a '%.100s' object "
@@ -284,7 +285,8 @@ wrapperdescr_call(PyWrapperDescrObject *descr, PyObject *args, PyObject *kwds)
return NULL;
}
self = PyTuple_GET_ITEM(args, 0);
- if (!PyObject_IsInstance(self, (PyObject *)PyDescr_TYPE(descr))) {
+ if (!_PyObject_RealIsSubclass((PyObject *)Py_TYPE(self),
+ (PyObject *)PyDescr_TYPE(descr))) {
PyErr_Format(PyExc_TypeError,
"descriptor '%V' "
"requires a '%.100s' object "
@@ -1065,7 +1067,8 @@ PyWrapper_New(PyObject *d, PyObject *self)
assert(PyObject_TypeCheck(d, &PyWrapperDescr_Type));
descr = (PyWrapperDescrObject *)d;
- assert(PyObject_IsInstance(self, (PyObject *)PyDescr_TYPE(descr)));
+ assert(_PyObject_RealIsSubclass((PyObject *)Py_TYPE(self),
+ (PyObject *)PyDescr_TYPE(descr)));
wp = PyObject_GC_New(wrapperobject, &wrappertype);
if (wp != NULL) {