mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

#15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete

Browse source
This commit is contained in:
Jesus Cea 2012-09-10 22:50:21 +02:00
commit 4886d5b338
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_mmap.py
View file

@ -491,11 +491,11 @@ class MmapTests(unittest.TestCase):
def test_empty_file (self):
f = open (TESTFN, 'w+b')
f.close()
f = open(TESTFN, "rb")
with open(TESTFN, "rb") as f :
self.assertRaisesRegex(ValueError,
"cannot mmap an empty file",
mmap.mmap, f.fileno(), 0, access=mmap.ACCESS_READ)
f.close()
mmap.mmap, f.fileno(), 0,
access=mmap.ACCESS_READ)
def test_offset (self):
f = open (TESTFN, 'w+b')

5
Modules/mmapmodule.c
View file

@ -1364,6 +1364,11 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
}
size = (((PY_LONG_LONG) high) << 32) + low;
if (size == 0) {
PyErr_SetString(PyExc_ValueError,
"cannot mmap an empty file");
return NULL;
}
if (offset >= size) {
PyErr_SetString(PyExc_ValueError,
"mmap offset is greater than file size");