commit 1cffbac2cbab551a829f0c843233ec98827947b3
author Benjamin Peterson <benjamin@python.org> Tue May 08 09:22:45 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Tue May 08 09:22:45 2012 -0400
tree 74c658718d0d0b9e9b350b4b0b81b6227c6c7305
parent d3f424fe4546325d74d9511c7de14e452d1cfb05
parent 89a6e9a27b565d8143c3e064aae92e831ff14801

merge 3.2 (#14752)

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 9babd57..309191e 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3709,6 +3709,7 @@
 
     for (; meth->ml_name != NULL; meth++) {
         PyObject *descr;
+        int err;
         if (PyDict_GetItemString(dict, meth->ml_name) &&
             !(meth->ml_flags & METH_COEXIST))
                 continue;
@@ -3732,9 +3733,10 @@
         }
         if (descr == NULL)
             return -1;
-        if (PyDict_SetItemString(dict, meth->ml_name, descr) < 0)
-            return -1;
+        err = PyDict_SetItemString(dict, meth->ml_name, descr);
         Py_DECREF(descr);
+        if (err < 0)
+            return -1;
     }
     return 0;
 }