diff options
| -rw-r--r-- | Lib/test/test_mmap.py | 25 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 8 |
3 files changed, 34 insertions, 4 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index 9fe044f..8b7e3e2 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -42,6 +42,10 @@ class MmapTests(unittest.TestCase): self.assertEqual(m[0], 0) self.assertEqual(m[0:3], b'\0\0\0') + # Shouldn't crash on boundary (Issue #5292) + self.assertRaises(IndexError, m.__getitem__, len(m)) + self.assertRaises(IndexError, m.__setitem__, len(m), b'\0') + # Modify the file's content m[0] = b'3'[0] m[PAGESIZE +3: PAGESIZE +3+3] = b'bar' @@ -412,6 +416,27 @@ class MmapTests(unittest.TestCase): m = mmap.mmap(f.fileno(), mapsize - halfsize, offset=halfsize) self.assertEqual(m[0:3], b'foo') f.close() + + # Try resizing map + try: + m.resize(512) + except SystemError: + pass + else: + # resize() is supported + self.assertEqual(len(m), 512) + # Check that we can no longer seek beyond the new size. + self.assertRaises(ValueError, m.seek, 513, 0) + # Check that the content is not changed + self.assertEqual(m[0:3], b'foo') + + # Check that the underlying file is truncated too + f = open(TESTFN) + f.seek(0, 2) + self.assertEqual(f.tell(), halfsize + 512) + f.close() + self.assertEqual(m.size(), halfsize + 512) + m.close() finally: @@ -169,6 +169,11 @@ Core and Builtins Library ------- +- Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, + The file was resized to wrong size. + +- Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. + - Issue #2279: distutils.sdist.add_defaults now add files from the package_data and the data_files metadata. diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 034bd22..7fa1037 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -455,7 +455,7 @@ mmap_resize_method(mmap_object *self, off_lo = (DWORD)(self->offset & 0xFFFFFFFF); #else newSizeHigh = 0; - newSizeLow = (DWORD)new_size; + newSizeLow = (DWORD)(self->offset + new_size); off_hi = 0; off_lo = (DWORD)self->offset; #endif @@ -501,7 +501,7 @@ mmap_resize_method(mmap_object *self, } else { void *newmap; - if (ftruncate(self->fd, new_size) == -1) { + if (ftruncate(self->fd, self->offset + new_size) == -1) { PyErr_SetFromErrno(mmap_module_error); return NULL; } @@ -692,7 +692,7 @@ mmap_subscript(mmap_object *self, PyObject *item) return NULL; if (i < 0) i += self->size; - if (i < 0 || (size_t)i > self->size) { + if (i < 0 || (size_t)i >= self->size) { PyErr_SetString(PyExc_IndexError, "mmap index out of range"); return NULL; @@ -797,7 +797,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value) return -1; if (i < 0) i += self->size; - if (i < 0 || (size_t)i > self->size) { + if (i < 0 || (size_t)i >= self->size) { PyErr_SetString(PyExc_IndexError, "mmap index out of range"); return -1; |