diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-04-04 14:18:13 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2009-04-04 14:18:13 +0000 |
| commit | 89e171d60d39f8c7c00ce17a053462fd129f2001 (patch) | |
| tree | 4195671740b03d35645b57ba98c5f010550eae84 /Python/pythonrun.c | |
| parent | f37f7557f44b777ea9e6f116692c7bebfa4b7339 (diff) | |
| download | cpython-89e171d60d39f8c7c00ce17a053462fd129f2001.tar.gz | |
- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with
short file names.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index b3866cebb8..8fc0ca199f 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -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) |