changeset:   78191:4b724884c81f
branch:      3.2
parent:      78188:6b771075cfa3
user:        Andrew Svetlov <andrew.svetlov@gmail.com>
date:        Fri Jul 20 14:51:45 2012 +0300
files:       Misc/NEWS Objects/classobject.c
description:
Issue #15404: Refleak in PyMethodObject repr.


diff -r 6b771075cfa3 -r 4b724884c81f Misc/NEWS
--- a/Misc/NEWS	Fri Jul 20 09:50:18 2012 +0100
+++ b/Misc/NEWS	Fri Jul 20 14:51:45 2012 +0300
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15404: Refleak in PyMethodObject repr.
+
 - Issue #15394: An issue in PyModule_Create that caused references to
   be leaked on some error paths has been fixed.  Patch by Julia Lawall.
 
diff -r 6b771075cfa3 -r 4b724884c81f Objects/classobject.c
--- a/Objects/classobject.c	Fri Jul 20 09:50:18 2012 +0100
+++ b/Objects/classobject.c	Fri Jul 20 14:51:45 2012 +0300
@@ -243,8 +243,10 @@
     else {
         klassname = PyObject_GetAttrString(klass, "__name__");
         if (klassname == NULL) {
-            if (!PyErr_ExceptionMatches(PyExc_AttributeError))
+            if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+                Py_XDECREF(funcname);
                 return NULL;
+            }
             PyErr_Clear();
         }
         else if (!PyUnicode_Check(klassname)) {