traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #19428: Handle PyMarshal_Read*() errors in run_pyc_file() 

Detect also earlier PyMarshal_Read*() errors in zipimport.
This commit is contained in:
Victor Stinner 2015-03-18 13:56:25 +01:00
parent 50931f41d0
commit 5200f55024
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/zipimport.c
View File

@ -939,6 +939,9 @@ read_directory(PyObject *archive)
header_size = name_size + header_size = name_size +
PyMarshal_ReadShortFromFile(fp) + PyMarshal_ReadShortFromFile(fp) +
PyMarshal_ReadShortFromFile(fp); PyMarshal_ReadShortFromFile(fp);
if (PyErr_Occurred())
goto error;
if (fread(dummy, 1, 8, fp) != 8) /* Skip unused fields, avoid fseek */ if (fread(dummy, 1, 8, fp) != 8) /* Skip unused fields, avoid fseek */
goto file_error; goto file_error;
file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset;

8
Python/pythonrun.c
View File

@ -981,13 +981,17 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
magic = PyMarshal_ReadLongFromFile(fp); magic = PyMarshal_ReadLongFromFile(fp);
if (magic != PyImport_GetMagicNumber()) { if (magic != PyImport_GetMagicNumber()) {
PyErr_SetString(PyExc_RuntimeError, if (!PyErr_Occurred())
"Bad magic number in .pyc file"); PyErr_SetString(PyExc_RuntimeError,
"Bad magic number in .pyc file");
return NULL; return NULL;
} }
/* Skip mtime and size */ /* Skip mtime and size */
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
if (PyErr_Occurred())
return NULL;
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);