mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 71152 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Matthias Klose 2009-04-04 14:32:42 +00:00
parent 1144648543
commit 042f133d82
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -59,6 +59,9 @@ Core and Builtins
- Issue #5392: when a very low recursion limit was set, the interpreter would - Issue #5392: when a very low recursion limit was set, the interpreter would
abort with a fatal error after the recursion limit was hit twice. abort with a fatal error after the recursion limit was hit twice.
- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with
short file names.
Library Library
------- -------

5
Python/pythonrun.c
View file

@ -1145,7 +1145,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
{ {
PyObject *m, *d, *v; PyObject *m, *d, *v;
const char *ext; const char *ext;
int set_file_name = 0, ret; int set_file_name = 0, ret, len;
m = PyImport_AddModule("__main__"); m = PyImport_AddModule("__main__");
if (m == NULL) if (m == NULL)
@ -1163,7 +1163,8 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
set_file_name = 1; set_file_name = 1;
Py_DECREF(f); 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)) { if (maybe_pyc_file(fp, filename, ext, closeit)) {
/* Try to run a pyc file. First, re-open in binary */ /* Try to run a pyc file. First, re-open in binary */
if (closeit) if (closeit)