[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#14752)

[benjamin.peterson]

http://hg.python.org/cpython/rev/07b04373aef8
changeset:   76838:07b04373aef8
parent:      76835:b32baa5b7626
parent:      76836:d937b527b76e
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue May 08 09:22:45 2012 -0400
summary:
  merge 3.2 (#14752)

files:
  Objects/typeobject.c |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- 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)
+        err = PyDict_SetItemString(dict, meth->ml_name, descr);
+        Py_DECREF(descr);
+        if (err < 0)
             return -1;
-        Py_DECREF(descr);
     }
     return 0;
 }

-- 
Repository URL: http://hg.python.org/cpython