traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Jesus Cea 2012-09-10 22:49:50 +02:00
parent 3159cb51a7
commit 1f2799bef4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_mmap.py
View File

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

5
Modules/mmapmodule.c
View File

@ -1342,6 +1342,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");