Closes #15676: mmap: add empty file check prior to offset check

This commit is contained in:
Jesus Cea 2012-09-10 00:27:55 +02:00
parent 7330da4297
commit 941bfcc537
3 changed files with 17 additions and 0 deletions

View File

@ -459,6 +459,15 @@ class MmapTests(unittest.TestCase):
f.flush ()
return mmap.mmap (f.fileno(), 0)
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()
def test_offset (self):
f = open (TESTFN, 'w+b')

View File

@ -463,6 +463,9 @@ Library
Extension Modules
-----------------
- Issue #15676: Now "mmap" check for empty files before doing the
offset check. Patch by Steven Willis.
- Issue #6493: An issue in ctypes on Windows that caused structure bitfields
of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed.

View File

@ -1141,6 +1141,11 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
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");
return NULL;
}
if (offset >= st.st_size) {
PyErr_SetString(PyExc_ValueError,
"mmap offset is greater than file size");