merge 3.5 (#26991)

benjaminp · benjaminp · commit 5b2b3aae2ae3 · 2016-05-16T22:53:44.000-07:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: tba
 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 --git a/Python/ceval.c b/Python/ceval.c
@@ -3291,6 +3291,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                 PyObject *anns = PyDict_New();
                 if (anns == NULL) {
                     Py_DECREF(func);
+                    Py_DECREF(names);
                     goto error;
                 }
                 name_ix = PyTuple_Size(names);
@@ -3306,9 +3307,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                     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 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                     goto error;
                 }
                 Py_DECREF(anns);
-                Py_DECREF(names);
             }
 
             /* XXX Maybe this should be a separate opcode? */

Original file line number	Diff line number	Diff line change
`@@ -3291,6 +3291,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`3291`	`3291`	`PyObject *anns = PyDict_New();`
`3292`	`3292`	`if (anns == NULL) {`
`3293`	`3293`	`Py_DECREF(func);`
	`3294`	`+ Py_DECREF(names);`
`3294`	`3295`	`goto error;`
`3295`	`3296`	`}`
`3296`	`3297`	`name_ix = PyTuple_Size(names);`
`@@ -3306,9 +3307,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`3306`	`3307`	`if (err != 0) {`
`3307`	`3308`	`Py_DECREF(anns);`
`3308`	`3309`	`Py_DECREF(func);`
	`3310`	`+ Py_DECREF(names);`
`3309`	`3311`	`goto error;`
`3310`	`3312`	`}`
`3311`	`3313`	`}`
	`3314`	`+ Py_DECREF(names);`
`3312`	`3315`
`3313`	`3316`	`if (PyFunction_SetAnnotations(func, anns) != 0) {`
`3314`	`3317`	`/* Can't happen unless`
`@@ -3318,7 +3321,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`3318`	`3321`	`goto error;`
`3319`	`3322`	`}`
`3320`	`3323`	`Py_DECREF(anns);`
`3321`		`- Py_DECREF(names);`
`3322`	`3324`	`}`
`3323`	`3325`
`3324`	`3326`	`/* XXX Maybe this should be a separate opcode? */`