Issue python#24268: Address some PEP 489 refleaks

ncoghlan · ncoghlan · commit a48db2bc8b88 · 2015-05-24T01:03:46.000+10:00
- missing DECREF in PyModule_FromDefAndSpec2
- missing DECREF in PyType_FromSpecAndBases2
- missing DECREF in _testmultiphase module

Patch by Petr Viktorin
diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c
@@ -262,6 +262,7 @@ createfunc_nonmodule(PyObject *spec, PyModuleDef *def)
         return NULL;
     }
     PyDict_SetItemString(dct, "three", three);
+    Py_DECREF(three);
 
     ns = _PyNamespace_New(dct);
     Py_DECREF(dct);
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -311,6 +311,7 @@ PyModule_FromDefAndSpec2(struct PyModuleDef* def, PyObject *spec, int module_api
         }
     }
 
+    Py_DECREF(nameobj);
     return m;
 
 error:
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -2694,6 +2694,7 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
 {
     PyHeapTypeObject *res = (PyHeapTypeObject*)PyType_GenericAlloc(&PyType_Type, 0);
     PyTypeObject *type, *base;
+    PyObject *modname;
     char *s;
     char *res_start = (char*)res;
     PyType_Slot *slot;
@@ -2807,11 +2808,15 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
 
     /* Set type.__module__ */
     s = strrchr(spec->name, '.');
-    if (s != NULL)
-        _PyDict_SetItemId(type->tp_dict, &PyId___module__,
-            PyUnicode_FromStringAndSize(
-                spec->name, (Py_ssize_t)(s - spec->name)));
-    else {
+    if (s != NULL) {
+        modname = PyUnicode_FromStringAndSize(
+                spec->name, (Py_ssize_t)(s - spec->name));
+        if (modname == NULL) {
+            goto fail;
+        }
+        _PyDict_SetItemId(type->tp_dict, &PyId___module__, modname);
+        Py_DECREF(modname);
+    } else {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                 "builtin type %.200s has no __module__ attribute",
                 spec->name))

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ createfunc_nonmodule(PyObject spec, PyModuleDef def)`
`262`	`262`	`return NULL;`
`263`	`263`	`}`
`264`	`264`	`PyDict_SetItemString(dct, "three", three);`
	`265`	`+ Py_DECREF(three);`
`265`	`266`
`266`	`267`	`ns = _PyNamespace_New(dct);`
`267`	`268`	`Py_DECREF(dct);`
Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ PyModule_FromDefAndSpec2(struct PyModuleDef* def, PyObject *spec, int module_api`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`
	`314`	`+ Py_DECREF(nameobj);`
`314`	`315`	`return m;`
`315`	`316`
`316`	`317`	`error:`