From: Guido van Rossum <guido@python.org>
Date: Tue, 9 Jun 1998 15:08:41 +0000 (+0000)
Subject: Should check that PyObject_Str() really returned a string!
X-Git-Tag: v1.5.2a1~505
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a0144c0de212e2bf63fe111939b4085cdd154df;p=thirdparty%2FPython%2Fcpython.git

Should check that PyObject_Str() really returned a string!
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 5e6a5a5938d7..dffc8e0e1a4a 100644
--- 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)