Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can 

only safely call a type's tp_compare slot if the second argument is
also an instance of the same type.  I hate to think what
e.g. int_compare() would do with a second argument that's a float!
This commit is contained in:
Guido van Rossum 2001-09-18 20:03:57 +00:00
parent 21009b9c6f
commit ceccae5365
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/typeobject.c
View File

@ -2033,6 +2033,15 @@ wrap_cmpfunc(PyObject *self, PyObject *args, void *wrapped)
if (!PyArg_ParseTuple(args, "O", &other)) if (!PyArg_ParseTuple(args, "O", &other))
return NULL; return NULL;
if (!PyType_IsSubtype(other->ob_type, self->ob_type)) {
PyErr_Format(
PyExc_TypeError,
"%s.__cmp__(x,y) requires y to be a '%s', not a '%s'",
self->ob_type->tp_name,
self->ob_type->tp_name,
other->ob_type->tp_name);
return NULL;
}
res = (*func)(self, other); res = (*func)(self, other);
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;