Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 52818:cb58c973985c 2.6
Merged revisions 71152 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71152 | matthias.klose | 2009-04-04 16:18:13 +0200 (Sa, 04 Apr 2009) | 3 lines
- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with
short file names.
........
| author | Matthias Klose <doko@ubuntu.com> |
|---|---|
| date | Sat, 04 Apr 2009 14:19:56 +0000 |
| parents | e2818b9f964b |
| children | 2abc3b4bce7c |
line wrap: on
line diff
--- a/Python/pythonrun.c Sat Apr 04 12:51:52 2009 +0000 +++ b/Python/pythonrun.c Sat Apr 04 14:19:56 2009 +0000 @@ -895,7 +895,7 @@ { 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) @@ -912,7 +912,8 @@ 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)