Exception__str__(): In case 1, be sure to decref the tmp local

variable.  This crushes another memory leak.  Slight rewrite
included.

diff --git a/Python/exceptions.c b/Python/exceptions.c
index c32e15ccbc5d6a661d8193f85e0946bf15e4bf2c..f766ba5ef34ddbb7742b940076a877dd7d9a247b 100644 (file)
--- a/Python/exceptions.c
+++ b/Python/exceptions.c
@@ -231,7 +231,6 @@ static PyObject*
 Exception__str__(PyObject* self, PyObject* args)
 {
     PyObject* out;
-    PyObject* tmp;
 
     if (!PyArg_ParseTuple(args, "O", &self))
         return NULL;
@@ -245,11 +244,16 @@ Exception__str__(PyObject* self, PyObject* args)
         out = PyString_FromString("");
         break;
     case 1:
-       if (!(tmp = PySequence_GetItem(args, 0)))
-           out = NULL;
-       else
+    {
+       PyObject* tmp = PySequence_GetItem(args, 0);
+       if (tmp) {
            out = PyObject_Str(tmp);
+           Py_DECREF(tmp);
+       }
+       else
+           out = NULL;
        break;
+    }
     default:
         out = PyObject_Str(args);
         break;