- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with

short file names.
This commit is contained in:
Matthias Klose 2009-04-04 14:18:13 +00:00
parent 29b36308a4
commit edb5e1e09e
2 changed files with 6 additions and 2 deletions

View file

@ -898,7 +898,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
{
PyObject *m, *d, *v;
const char *ext;
int set_file_name = 0, ret;
int set_file_name = 0, ret, len;
m = PyImport_AddModule("__main__");
if (m == NULL)
@ -915,7 +915,8 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
set_file_name = 1;
Py_DECREF(f);
}
ext = filename + strlen(filename) - 4;
len = strlen(filename);
ext = filename + len - (len > 4 ? 4 : 0);
if (maybe_pyc_file(fp, filename, ext, closeit)) {
/* Try to run a pyc file. First, re-open in binary */
if (closeit)