mirror of
https://github.com/python/cpython.git
synced 2025-07-12 05:45:15 +00:00
Issue #19428: Handle PyMarshal_Read*() errors in run_pyc_file()
Detect also earlier PyMarshal_Read*() errors in zipimport.
This commit is contained in:
parent
50931f41d0
commit
5200f55024
2 changed files with 9 additions and 2 deletions
|
@ -981,13 +981,17 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
|
|||
|
||||
magic = PyMarshal_ReadLongFromFile(fp);
|
||||
if (magic != PyImport_GetMagicNumber()) {
|
||||
PyErr_SetString(PyExc_RuntimeError,
|
||||
"Bad magic number in .pyc file");
|
||||
if (!PyErr_Occurred())
|
||||
PyErr_SetString(PyExc_RuntimeError,
|
||||
"Bad magic number in .pyc file");
|
||||
return NULL;
|
||||
}
|
||||
/* Skip mtime and size */
|
||||
(void) PyMarshal_ReadLongFromFile(fp);
|
||||
(void) PyMarshal_ReadLongFromFile(fp);
|
||||
if (PyErr_Occurred())
|
||||
return NULL;
|
||||
|
||||
v = PyMarshal_ReadLastObjectFromFile(fp);
|
||||
if (v == NULL || !PyCode_Check(v)) {
|
||||
Py_XDECREF(v);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue