[Python-checkins] cpython (2.7): Issue #16743: Fix mmap overflow check on 32 bit Windows
richard.oudkerk
python-checkins at python.org
Wed Feb 13 13:55:17 CET 2013
http://hg.python.org/cpython/rev/b1bbe519770b
changeset: 82198:b1bbe519770b
branch: 2.7
parent: 82195:72e75ea25d00
user: Richard Oudkerk <shibturn at gmail.com>
date: Wed Feb 13 12:05:14 2013 +0000
summary:
Issue #16743: Fix mmap overflow check on 32 bit Windows
files:
Lib/test/test_mmap.py | 7 +++++++
Modules/mmapmodule.c | 22 +++++++++++-----------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -682,6 +682,13 @@
def test_large_filesize(self):
with self._make_test_file(0x17FFFFFFF, b" ") as f:
+ if sys.maxsize < 0x180000000:
+ # On 32 bit platforms the file is larger than sys.maxsize so
+ # mapping the whole file should fail -- Issue #16743
+ with self.assertRaises(OverflowError):
+ mmap.mmap(f.fileno(), 0x180000000, access=mmap.ACCESS_READ)
+ with self.assertRaises(ValueError):
+ mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
m = mmap.mmap(f.fileno(), 0x10000, access=mmap.ACCESS_READ)
try:
self.assertEqual(m.size(), 0x180000000)
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1188,7 +1188,6 @@
# endif
if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
if (map_size == 0) {
- off_t calc_size;
if (st.st_size == 0) {
PyErr_SetString(PyExc_ValueError,
"cannot mmap an empty file");
@@ -1199,13 +1198,12 @@
"mmap offset is greater than file size");
return NULL;
}
- calc_size = st.st_size - offset;
- map_size = calc_size;
- if (map_size != calc_size) {
+ if (st.st_size - offset > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_ValueError,
"mmap length is too large");
- return NULL;
- }
+ return NULL;
+ }
+ map_size = (Py_ssize_t) (st.st_size - offset);
} else if (offset + (size_t)map_size > st.st_size) {
PyErr_SetString(PyExc_ValueError,
"mmap length is greater than file size");
@@ -1400,11 +1398,13 @@
Py_DECREF(m_obj);
return NULL;
}
- if (offset - size > PY_SSIZE_T_MAX)
- /* Map area too large to fit in memory */
- m_obj->size = (Py_ssize_t) -1;
- else
- m_obj->size = (Py_ssize_t) (size - offset);
+ if (size - offset > PY_SSIZE_T_MAX) {
+ PyErr_SetString(PyExc_ValueError,
+ "mmap length is too large");
+ Py_DECREF(m_obj);
+ return NULL;
+ }
+ m_obj->size = (Py_ssize_t) (size - offset);
} else {
m_obj->size = map_size;
size = offset + map_size;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list