mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-29 05:05:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix leak when an exception is raised during generator creation. (GH-29960)

Browse source
This commit is contained in:
Mark Shannon 2021-12-07 18:05:48 +00:00 • committed by GitHub
parent d596acbd3b
commit 064e53d19a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Python/ceval.c
View file

@ -5852,24 +5852,6 @@ fail_post_args:
return -1; return -1;
} }
static int
initialize_coro_frame(InterpreterFrame *frame, PyThreadState *tstate,
PyFunctionObject *func, PyObject *locals,
PyObject *const *args, Py_ssize_t argcount,
PyObject *kwnames)
{
assert(is_tstate_valid(tstate));
assert(func->func_defaults == NULL || PyTuple_CheckExact(func->func_defaults));
PyCodeObject *code = (PyCodeObject *)func->func_code;
_PyFrame_InitializeSpecials(frame, func, locals, code->co_nlocalsplus);
for (int i = 0; i < code->co_nlocalsplus; i++) {
frame->localsplus[i] = NULL;
}
assert(frame->frame_obj == NULL);
return initialize_locals(tstate, func, frame->localsplus, args, argcount, kwnames);
}
/* Consumes all the references to the args */ /* Consumes all the references to the args */
static PyObject * static PyObject *
make_coro(PyThreadState *tstate, PyFunctionObject *func, make_coro(PyThreadState *tstate, PyFunctionObject *func,
@ -5883,12 +5865,17 @@ make_coro(PyThreadState *tstate, PyFunctionObject *func,
return NULL; return NULL;
} }
InterpreterFrame *frame = (InterpreterFrame *)((PyGenObject *)gen)->gi_iframe; InterpreterFrame *frame = (InterpreterFrame *)((PyGenObject *)gen)->gi_iframe;
if (initialize_coro_frame(frame, tstate, func, locals, args, argcount, kwnames)) { PyCodeObject *code = (PyCodeObject *)func->func_code;
_PyFrame_InitializeSpecials(frame, func, locals, code->co_nlocalsplus);
for (int i = 0; i < code->co_nlocalsplus; i++) {
frame->localsplus[i] = NULL;
}
((PyGenObject *)gen)->gi_frame_valid = 1;
if (initialize_locals(tstate, func, frame->localsplus, args, argcount, kwnames)) {
Py_DECREF(gen); Py_DECREF(gen);
return NULL; return NULL;
} }
frame->generator = gen; frame->generator = gen;
((PyGenObject *)gen)->gi_frame_valid = 1;
return gen; return gen;
} }