Check return type of __nonzero__() method.
The language reference says you must return an int or a bool. This
fix limits the scope of SF bug 759227 (infinite recursion) to
subclasses of int.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index df9e617..7c4e744 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4196,7 +4196,19 @@
PyObject *temp = PyObject_Call(func, args, NULL);
Py_DECREF(args);
if (temp != NULL) {
- result = PyObject_IsTrue(temp);
+ if (PyInt_Check(temp)) {
+ /* XXX need to guard against recursion here */
+ result = PyObject_IsTrue(temp);
+ }
+ else if (PyBool_Check(temp))
+ result = PyObject_IsTrue(temp);
+ else {
+ PyErr_Format(PyExc_TypeError,
+ "__nonzero__ should return "
+ "bool or int, returned %s",
+ temp->ob_type->tp_name);
+ result = NULL;
+ }
Py_DECREF(temp);
}
}