mirror of https://github.com/python/cpython
Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0,
The file was resized to wrong size.
This commit is contained in:
parent
1d0b5cc6dc
commit
17a837e4db
|
@ -417,6 +417,27 @@ class MmapTests(unittest.TestCase):
|
|||
m = mmap.mmap(f.fileno(), mapsize - halfsize, offset=halfsize)
|
||||
self.assertEqual(m[0:3], '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], '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:
|
||||
|
|
|
@ -159,6 +159,9 @@ 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
|
||||
|
|
|
@ -444,7 +444,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
|
||||
|
@ -490,7 +490,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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue