Fix mmap and test_mmap under Windows too (followup to r88022)

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index c7b8d60d1e53aa63207df8d64470d3a884999a9d..08b0714da02c54866127c1d77bffeff4ef056759 100644 (file)
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -325,13 +325,14 @@ class MmapTests(unittest.TestCase):
         # map length with an offset doesn't cause a segfault.
         if not hasattr(os, "stat"):
             self.skipTest("needs os.stat")
-        with open(TESTFN, "wb+") as f:
-            f.write(49152 * b'm') # Arbitrary character
+        # NOTE: allocation granularity is currently 65536 under Win64,
+        # and therefore the minimum offset alignment.
+        with open(TESTFN, "wb") as f:
+            f.write((65536 * 2) * b'm') # Arbitrary character
 
         with open(TESTFN, "rb") as f:
-            mf = mmap.mmap(f.fileno(), 0, offset=40960, access=mmap.ACCESS_READ)
-            self.assertRaises(IndexError, mf.__getitem__, 45000)
-            mf.close()
+            with mmap.mmap(f.fileno(), 0, offset=65536, access=mmap.ACCESS_READ) as mf:
+                self.assertRaises(IndexError, mf.__getitem__, 80000)
 
     def test_move(self):
         # make move works everywhere (64-bit format problem earlier)

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index ef026b260ffdb9022f780f0da239be9a9f04567d..f3b2f503dfdba3e28a24f1a961c03c5b5a8a0ef0 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1300,6 +1300,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
             else
                 m_obj->size = low;
 #endif
+            m_obj->size -= offset;
         } else {
             m_obj->size = map_size;
         }