Merge 3.5 (issue #27942)

1st1 · 1st1 · commit 6c1065061770 · 2016-11-09T09:43:08.000-05:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -588,6 +588,8 @@ Core and Builtins
 
 - Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
 
+- Issue #27942: Fix memory leak in codeobject.c
+
 Library
 -------
 
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -77,6 +77,7 @@ intern_string_constants(PyObject *tuple)
             intern_string_constants(v);
         }
         else if (PyFrozenSet_CheckExact(v)) {
+            PyObject *w = v;
             PyObject *tmp = PySequence_Tuple(v);
             if (tmp == NULL) {
                 PyErr_Clear();
@@ -89,6 +90,7 @@ intern_string_constants(PyObject *tuple)
                 }
                 else {
                     PyTuple_SET_ITEM(tuple, i, v);
+                    Py_DECREF(w);
                     modified = 1;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ intern_string_constants(PyObject *tuple)`
`77`	`77`	`intern_string_constants(v);`
`78`	`78`	`}`
`79`	`79`	`else if (PyFrozenSet_CheckExact(v)) {`
	`80`	`+ PyObject *w = v;`
`80`	`81`	`PyObject *tmp = PySequence_Tuple(v);`
`81`	`82`	`if (tmp == NULL) {`
`82`	`83`	`PyErr_Clear();`
`@@ -89,6 +90,7 @@ intern_string_constants(PyObject *tuple)`
`89`	`90`	`}`
`90`	`91`	`else {`
`91`	`92`	`PyTuple_SET_ITEM(tuple, i, v);`
	`93`	`+ Py_DECREF(w);`
`92`	`94`	`modified = 1;`
`93`	`95`	`}`
`94`	`96`	`}`