Merged revisions 69714,69718 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69714 | hirokazu.yamamoto | 2009-02-17 19:12:10 +0900 | 1 line
Issue #5292: Fixed mmap crash on its boundary access m[len(m)].
........
r69718 | hirokazu.yamamoto | 2009-02-17 22:17:26 +0900 | 3 lines
Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0,
The file was resized to wrong size.
........
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index a03957c..fad60d1 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -444,7 +444,7 @@
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
@@ -490,7 +490,7 @@
} 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;
}
@@ -731,7 +731,7 @@
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 @@
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;