From d6bf45bcf669a13b2d8c3996b466c5171eca0e53 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 5 Sep 1997 19:11:53 +0000 Subject: Fixed some details of printing the str() of an exception. This fixes a core dump when __str__() returns a non-string, and plugs a memory leak as well: the result of PyObject_Str() was never DECREFed. --- Python/pythonrun.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index c7832dc..610ec7a 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -761,10 +761,14 @@ PyErr_Print() /* only print colon if the str() of the object is not the empty string */ - if (s && strcmp(PyString_AsString(s), "")) + if (s == NULL) + err = -1; + else if (!PyString_Check(s) || + PyString_GET_SIZE(s) != 0) err = PyFile_WriteString(": ", f); if (err == 0) - err = PyFile_WriteObject(v, f, Py_PRINT_RAW); + err = PyFile_WriteObject(s, f, Py_PRINT_RAW); + Py_XDECREF(s); } } if (err == 0) -- cgit v0.12