diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-05-17 05:53:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-05-17 05:53:44 (GMT) |
| commit | 5b2b3aae2ae3e456209cb723d9aeceb242c9498e (patch) | |
| tree | faebbcf0a5a6ddd28c7843a210e067722b272b9c | |
| parent | 2deb1eafece1ef4c8e0f1b168d4b85ba23c3ac9d (diff) | |
| parent | ad887cf7d1257e73819fa9fd926f15849192888c (diff) | |
| download | cpython-5b2b3aae2ae3e456209cb723d9aeceb242c9498e.zip cpython-5b2b3aae2ae3e456209cb723d9aeceb242c9498e.tar.gz cpython-5b2b3aae2ae3e456209cb723d9aeceb242c9498e.tar.bz2 | |
merge 3.5 (#26991)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/ceval.c | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -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 index b461030..9870a55 100644 --- 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? */ |