changeset:   105012:c27269c0d619
parent:      105008:b78574cb00ab
parent:      105011:b671ac7ae620
user:        Yury Selivanov <yury@magic.io>
date:        Wed Nov 09 09:43:37 2016 -0500
files:       Misc/NEWS
description:
Merge 3.6 (issue #27942)


diff -r b78574cb00ab -r c27269c0d619 Misc/NEWS
--- a/Misc/NEWS	Tue Nov 08 22:53:59 2016 -0500
+++ b/Misc/NEWS	Wed Nov 09 09:43:37 2016 -0500
@@ -588,6 +588,8 @@
 
 - Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
 
+- Issue #27942: Fix memory leak in codeobject.c
+
 Library
 -------
 
diff -r b78574cb00ab -r c27269c0d619 Objects/codeobject.c
--- a/Objects/codeobject.c	Tue Nov 08 22:53:59 2016 -0500
+++ b/Objects/codeobject.c	Wed Nov 09 09:43:37 2016 -0500
@@ -77,6 +77,7 @@
             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 @@
                 }
                 else {
                     PyTuple_SET_ITEM(tuple, i, v);
+                    Py_DECREF(w);
                     modified = 1;
                 }
             }