PyFunction_Call() did not check the result of PyObject_Repr() for NULL, and

freddrake · freddrake · commit 573395a7a816 · 2001-11-01T20:26:12.000Z
should just avoid calling it in the first place to avoid waiting for a repr
of a large object like a dict or list.  The result of PyObject_Repr() was
being leaked as well.
Bugfix candidate!
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -1660,8 +1660,8 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw)
 				"NULL result without error in PyObject_Call");
 		return result;
 	}
-	PyErr_Format(PyExc_TypeError, "object is not callable: %s",
-		     PyString_AS_STRING(PyObject_Repr(func)));
+	PyErr_Format(PyExc_TypeError, "'%s' object is not callable",
+		     func->ob_type->tp_name);
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1660,8 +1660,8 @@ PyObject_Call(PyObject func, PyObject arg, PyObject *kw)`
`1660`	`1660`	`"NULL result without error in PyObject_Call");`
`1661`	`1661`	`return result;`
`1662`	`1662`	`}`
`1663`		`- PyErr_Format(PyExc_TypeError, "object is not callable: %s",`
`1664`		`- PyString_AS_STRING(PyObject_Repr(func)));`
	`1663`	`+ PyErr_Format(PyExc_TypeError, "'%s' object is not callable",`
	`1664`	`+ func->ob_type->tp_name);`
`1665`	`1665`	`return NULL;`
`1666`	`1666`	`}`
`1667`	`1667`