Skip to content

Commit

Permalink
bpo-29655: Fixed possible reference leaks in import *. (#301) (#348)
Browse files Browse the repository at this point in the history
Patch by Matthias Bussonnier.

(cherry picked from commit 160edb4)
  • Loading branch information
berkerpeksag committed Feb 27, 2017
1 parent bb59d89 commit 7accf20
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Python/ceval.c
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

0 comments on commit 7accf20

Please sign in to comment.