diff options
| author | Guido van Rossum <guido@python.org> | 1998-06-09 15:08:41 +0000 | 
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1998-06-09 15:08:41 +0000 | 
| commit | 4a0144c0de212e2bf63fe111939b4085cdd154df (patch) | |
| tree | 3b45b7c2ce0e95e2cdaa16ec90553cc4a11ac7e0 | |
| parent | fe02efdbf44628329919991a4ea181183b2da9ff (diff) | |
| download | cpython-git-4a0144c0de212e2bf63fe111939b4085cdd154df.tar.gz | |
Should check that PyObject_Str() really returned a string!
| -rw-r--r-- | Objects/stringobject.c | 5 | 
1 files changed, 5 insertions, 0 deletions
| diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 5e6a5a5938..dffc8e0e1a 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) | 
