Visitar URL original
[3.6] bpo-29655: Fixed possible reference leaks in `import *`. (#301) by berkerpeksag · Pull Request #348 · python/cpython · GitHub
Skip to content

[3.6] bpo-29655: Fixed possible reference leaks in import *. (#301) #348

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
berkerpeksag merged 1 commit into from
Feb 27, 2017
Merged

[3.6] bpo-29655: Fixed possible reference leaks in import *. (#301) #348

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
bpo-29655: Fixed possible reference leaks in import *. (#301) 
Patch by Matthias Bussonnier.

(cherry picked from commit 160edb4)
  • Loading branch information
@Carreau @berkerpeksag
Carreau authored and berkerpeksag committed Feb 27, 2017
commit 8215abcfaa13a6e05b2ec7af07364d370e67ff7c
5 changes: 4 additions & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2857,13 +2857,16 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
TARGET(IMPORT_STAR) {
PyObject *from = POP(), *locals;
int err;
if (PyFrame_FastToLocalsWithError(f) < 0)
if (PyFrame_FastToLocalsWithError(f) < 0) {
Py_DECREF(from);
goto error;
}

locals = f->f_locals;
if (locals == NULL) {
PyErr_SetString(PyExc_SystemError,
"no locals found during 'import *'");
Py_DECREF(from);
goto error;
}
err = import_all_from(locals, from);
Expand Down