fix possible refleak (closes #14752)

benjaminp · benjaminp · commit 89a6e9a27b56 · 2012-05-08T09:22:24.000-04:00
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -3527,6 +3527,7 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
 
     for (; meth->ml_name != NULL; meth++) {
         PyObject *descr;
+        int err;
         if (PyDict_GetItemString(dict, meth->ml_name) &&
             !(meth->ml_flags & METH_COEXIST))
                 continue;
@@ -3550,9 +3551,10 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
         }
         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;
 }

Original file line number	Diff line number	Diff line change
`@@ -3527,6 +3527,7 @@ add_methods(PyTypeObject type, PyMethodDef meth)`
`3527`	`3527`
`3528`	`3528`	`for (; meth->ml_name != NULL; meth++) {`
`3529`	`3529`	`PyObject *descr;`
	`3530`	`+ int err;`
`3530`	`3531`	`if (PyDict_GetItemString(dict, meth->ml_name) &&`
`3531`	`3532`	`!(meth->ml_flags & METH_COEXIST))`
`3532`	`3533`	`continue;`
`@@ -3550,9 +3551,10 @@ add_methods(PyTypeObject type, PyMethodDef meth)`
`3550`	`3551`	`}`
`3551`	`3552`	`if (descr == NULL)`
`3552`	`3553`	`return -1;`
`3553`		`- if (PyDict_SetItemString(dict, meth->ml_name, descr) < 0)`
`3554`		`- return -1;`
	`3554`	`+ err = PyDict_SetItemString(dict, meth->ml_name, descr);`
`3555`	`3555`	`Py_DECREF(descr);`
	`3556`	`+ if (err < 0)`
	`3557`	`+ return -1;`
`3556`	`3558`	`}`
`3557`	`3559`	`return 0;`
`3558`	`3560`	`}`