Should check that PyObject_Str() really returned a string!

4a0144c0 · Guido van Rossum · fe02efdb · 4a0144c0
Commit 4a0144c0 authored Jun 09, 1998 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Objects/stringobject.c Objects/stringobject.c +5 -0

No files found.
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -900,6 +900,11 @@ PyString_Format(format, args)
 				temp = PyObject_Str(v);
 				if (temp == NULL)
 					goto error;
+				if (!PyString_Check(temp)) {
+					PyErr_SetString(PyExc_TypeError,
+					  "%s argument has non-string str()");
+					goto error;
+				}
 				buf = PyString_AsString(temp);
 				len = PyString_Size(temp);
 				if (prec >= 0 && len > prec)