Skip to content

bpo-45256: Fix cleanup of stolen locals for Python-to-Python calls #28905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 1 commit into from
Oct 13, 2021
Merged

bpo-45256: Fix cleanup of stolen locals for Python-to-Python calls #28905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5619,6 +5619,30 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
return 0;

fail: /* Jump here from prelude on failure */
if (steal_args) {
// If we failed to initialize locals, make sure the caller still own all the
// arguments that were on the stack. We need to increment the reference count
// of everything we copied (everything in localsplus) that came from the stack
// (everything that is present in the "args" array).
Py_ssize_t kwcount = kwnames != NULL ? PyTuple_GET_SIZE(kwnames) : 0;
for (Py_ssize_t k=0; k < total_args; k++) {
PyObject* arg = localsplus[k];
for (Py_ssize_t j=0; j < argcount + kwcount; j++) {
if (args[j] == arg) {
Py_XINCREF(arg);
break;
}
}
}
// Restore all the **kwargs we placed into the kwargs dictionary
if (kwdict) {
PyObject *key, *value;
Py_ssize_t pos = 0;
while (PyDict_Next(kwdict, &pos, &key, &value)) {
Py_INCREF(value);
}
}
}
return -1;

}
Expand Down Expand Up @@ -5683,16 +5707,6 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFrameConstructor *con,
}
PyObject **localsarray = _PyFrame_GetLocalsArray(frame);
if (initialize_locals(tstate, con, localsarray, args, argcount, kwnames, steal_args)) {
if (steal_args) {
// If we failed to initialize locals, make sure the caller still own all the
// arguments. Notice that we only need to increase the reference count of the
// *valid* arguments (i.e. the ones that fit into the frame).
PyCodeObject *co = (PyCodeObject*)con->fc_code;
const size_t total_args = co->co_argcount + co->co_kwonlyargcount;
for (size_t i = 0; i < Py_MIN(argcount, total_args); i++) {
Py_XINCREF(frame->localsplus[i]);
}
}
_PyFrame_Clear(frame, 0);
return NULL;
}
Expand Down