changeset:   101397:7270701cf5bc
parent:      101395:706bd1640ff3
parent:      101396:eaa3a71a6f62
user:        Benjamin Peterson <benjamin@python.org>
date:        Mon May 16 22:53:44 2016 -0700
files:       Misc/NEWS Python/ceval.c
description:
merge 3.5 (#26991)


diff -r 706bd1640ff3 -r 7270701cf5bc Misc/NEWS
--- a/Misc/NEWS	Mon May 16 23:32:41 2016 -0400
+++ b/Misc/NEWS	Mon May 16 22:53:44 2016 -0700
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #26991: Fix possible refleak when creating a function with annotations.
+
 - Issue #27039: Fixed bytearray.remove() for values greater than 127.  Based on
   patch by Joe Jevnik.
 
diff -r 706bd1640ff3 -r 7270701cf5bc Python/ceval.c
--- a/Python/ceval.c	Mon May 16 23:32:41 2016 -0400
+++ b/Python/ceval.c	Mon May 16 22:53:44 2016 -0700
@@ -3291,6 +3291,7 @@
                 PyObject *anns = PyDict_New();
                 if (anns == NULL) {
                     Py_DECREF(func);
+                    Py_DECREF(names);
                     goto error;
                 }
                 name_ix = PyTuple_Size(names);
@@ -3306,9 +3307,11 @@
                     if (err != 0) {
                         Py_DECREF(anns);
                         Py_DECREF(func);
+                        Py_DECREF(names);
                         goto error;
                     }
                 }
+                Py_DECREF(names);
 
                 if (PyFunction_SetAnnotations(func, anns) != 0) {
                     /* Can't happen unless
@@ -3318,7 +3321,6 @@
                     goto error;
                 }
                 Py_DECREF(anns);
-                Py_DECREF(names);
             }
 
             /* XXX Maybe this should be a separate opcode? */