Fix memory leak found by valgrind.

neal.norwitz · neal.norwitz · commit 8ea757ab4fbc · 2006-06-02T04:50:49.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@46600 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
@@ -265,15 +265,17 @@ def testAttributes(self):
                 if (e is not exc and     # needed for sampleUnicode errors
                     type(e) is not exc):
                     raise
-                for checkArgName in expected.keys():
+                # Verify no ref leaks in Exc_str()
+                s = str(e)
+                for checkArgName in expected:
                     self.assertEquals(repr(getattr(e, checkArgName)),
                                       repr(expected[checkArgName]),
                                       'exception "%s", attribute "%s"' %
                                        (repr(e), checkArgName))
 
                 # test for pickling support
                 new = pickle.loads(pickle.dumps(e, random.randint(0, 2)))
-                for checkArgName in expected.keys():
+                for checkArgName in expected:
                     self.assertEquals(repr(getattr(e, checkArgName)),
                                       repr(expected[checkArgName]),
                                       'pickled exception "%s", attribute "%s' %
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -619,7 +619,6 @@ EnvironmentError_str(PyEnvironmentErrorObject *self)
             PyTuple_SET_ITEM(tuple, 1, Py_None);
         }
 
-        Py_INCREF(repr);
         PyTuple_SET_ITEM(tuple, 2, repr);
 
         rtnval = PyString_Format(fmt, tuple);

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,6 @@ EnvironmentError_str(PyEnvironmentErrorObject *self)`
`619`	`619`	`PyTuple_SET_ITEM(tuple, 1, Py_None);`
`620`	`620`	`}`
`621`	`621`
`622`		`- Py_INCREF(repr);`
`623`	`622`	`PyTuple_SET_ITEM(tuple, 2, repr);`
`624`	`623`
`625`	`624`	`rtnval = PyString_Format(fmt, tuple);`