diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-15 16:18:57 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-15 16:18:57 (GMT) |
| commit | 9989d857ebfa6b29d724921e5fc229cd9d4dbb61 (patch) | |
| tree | d576aa26bd4ebc39e06cc80b3b3c415d5ea87eea /Modules | |
| parent | 733870909d8f12e98ed0a3ce7862221f3810ca3e (diff) | |
| download | cpython-9989d857ebfa6b29d724921e5fc229cd9d4dbb61.zip cpython-9989d857ebfa6b29d724921e5fc229cd9d4dbb61.tar.gz cpython-9989d857ebfa6b29d724921e5fc229cd9d4dbb61.tar.bz2 | |
Merged revisions 88022 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88022 | antoine.pitrou | 2011-01-15 17:17:07 +0100 (sam., 15 janv. 2011) | 7 lines
Issue #10916: mmap should not segfault when a file is mapped using 0 as
length and a non-zero offset, and an attempt to read past the end of file
is made (IndexError is raised instead). Patch by Ross Lagerwall.
Requested by Georg.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/mmapmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index d6d1601..6ca95c9 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -1164,7 +1164,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) # endif if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) { if (map_size == 0) { - map_size = st.st_size; + map_size = st.st_size - offset; } else if ((size_t)offset + (size_t)map_size > st.st_size) { PyErr_SetString(PyExc_ValueError, "mmap length is greater than file size"); |