mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-33451: Close pyc files before calling PyEval_EvalCode() (GH-7884)

Browse source 
Directly executed pyc files were being kept open longer than necessary.
This commit is contained in:
Zackery Spytz 2018-06-23 21:15:24 -06:00 • committed by Nick Coghlan
parent 0ba9a0b7d1
commit ea737751b1
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2018-06-23-15-32-02.bpo-33451.sWN-1l.rst Normal file
View file

@ -0,0 +1 @@
Close directly executed pyc files before calling ``PyEval_EvalCode()``.

15
Python/pythonrun.c
View file

@ -418,7 +418,6 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
goto done; goto done;
} }
v = run_pyc_file(pyc_fp, filename, d, d, flags); v = run_pyc_file(pyc_fp, filename, d, d, flags);
fclose(pyc_fp);
} else { } else {
/* When running from stdin, leave __main__.__loader__ alone */ /* When running from stdin, leave __main__.__loader__ alone */
if (strcmp(filename, "<stdin>") != 0 && if (strcmp(filename, "<stdin>") != 0 &&
@ -1051,28 +1050,32 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"Bad magic number in .pyc file"); "Bad magic number in .pyc file");
return NULL; goto error;
} }
/* Skip the rest of the header. */ /* Skip the rest of the header. */
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
if (PyErr_Occurred()) if (PyErr_Occurred()) {
return NULL; goto error;
}
v = PyMarshal_ReadLastObjectFromFile(fp); v = PyMarshal_ReadLastObjectFromFile(fp);
if (v == NULL || !PyCode_Check(v)) { if (v == NULL || !PyCode_Check(v)) {
Py_XDECREF(v); Py_XDECREF(v);
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"Bad code object in .pyc file"); "Bad code object in .pyc file");
return NULL; goto error;
} }
fclose(fp);
co = (PyCodeObject *)v; co = (PyCodeObject *)v;
v = PyEval_EvalCode((PyObject*)co, globals, locals); v = PyEval_EvalCode((PyObject*)co, globals, locals);
if (v && flags) if (v && flags)
flags->cf_flags |= (co->co_flags & PyCF_MASK); flags->cf_flags |= (co->co_flags & PyCF_MASK);
Py_DECREF(co); Py_DECREF(co);
return v; return v;
error:
fclose(fp);
return NULL;
} }
PyObject * PyObject *