diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-02-17 10:12:10 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-02-17 10:12:10 (GMT) |
| commit | f6bbd0e71d986e0acefb4b3708d9129a9bce4a17 (patch) | |
| tree | a33dde057c2b37a0472d785136a21749e201a5ac | |
| parent | f68b5b804675326fb05e20b3f327bd774fa95d09 (diff) | |
| download | cpython-f6bbd0e71d986e0acefb4b3708d9129a9bce4a17.zip cpython-f6bbd0e71d986e0acefb4b3708d9129a9bce4a17.tar.gz cpython-f6bbd0e71d986e0acefb4b3708d9129a9bce4a17.tar.bz2 | |
Issue #5292: Fixed mmap crash on its boundary access m[len(m)].
| -rw-r--r-- | Lib/test/test_mmap.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index 6fecaf5..e1e5967 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -41,6 +41,10 @@ class MmapTests(unittest.TestCase): self.assertEqual(m[0], '\0') self.assertEqual(m[0:3], '\0\0\0') + # Shouldn't crash on boundary (Issue #5292) + self.assertRaises(IndexError, m.__getitem__, len(m)) + self.assertRaises(IndexError, m.__setitem__, len(m), '\0') + # Modify the file's content m[0] = '3' m[PAGESIZE +3: PAGESIZE +3+3] = 'bar' @@ -159,6 +159,8 @@ Core and Builtins Library ------- +- 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 a03957c..df2c058 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -731,7 +731,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; @@ -872,7 +872,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; |