fix test

python · JelleZijlstra · May 20, 2023 · Apr 29, 2023 · Apr 29, 2023 · Apr 29, 2023
commit e0de742bb7b4d81bc0291843d4fea06fc298c562
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
@@ -283,23 +283,30 @@ def __index__(self):
         with self.assertRaises(ValueError):
             m[X()] # should not crash
 
-        with self.assertRaises(ValueError):
-            m[X():5] # should not crash
-
         with self.assertRaises(ValueError):
             m[X()] = 1
             m[X()] # should through ValueError
 
-        with self.assertRaises(ValueError):
-            m[X():5] = b'abcde'
-            m[X():5] # should through ValueError
+    def test_unexpected_mmap_close_scenario_2(self):
+        # See gh-103987
+        with open(TESTFN, "wb+") as f:
+            data = b'aabaac\x00deef\x00\x00aa\x00'
+            n = len(data)
+            f.write(data)
+            f.flush()
 
-        m.close() # first CHECK_VALID will pick and raise ValueError
-        with self.assertRaises(ValueError):
-            m[0:5] # should not crash
+            class X:
+                def __index__(self):
+                    m.close()
+                    return 1
 
+            m = mmap.mmap(f.fileno(), n, access=mmap.ACCESS_READ)
 
-    def test_unexpected_mmap_close_scenario_2(self):
+        self.assertEqual(m[1], 97)
+        with self.assertRaises(ValueError):
+            m[X():5] # should not crash
+
+    def test_unexpected_mmap_close_scenario_3(self):
 
         with open(TESTFN, "wb+") as f:
             data = b'aabaac\x00deef\x00\x00aa\x00'
@@ -313,6 +320,19 @@ def test_unexpected_mmap_close_scenario_2(self):
         with self.assertRaises(ValueError):
             m["abc"] # first CHECK_VALID will pick and raise ValueError
 
+    def test_unexpected_mmap_close_scenario_4(self):
+
+        with open(TESTFN, "wb+") as f:
+            data = b'aabaac\x00deef\x00\x00aa\x00'
+            n = len(data)
+            f.write(data)
+            f.flush()
+
+            m = mmap.mmap(f.fileno(), n, access=mmap.ACCESS_READ)
+
+        m.close() # first CHECK_VALID will pick and raise ValueError
+        with self.assertRaises(ValueError):
+            m[0:5] # should not crash
 
 
     def test_tougher_find(self):

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -954,6 +954,7 @@ mmap_subscript(mmap_object *self, PyObject *item)
         if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
+        CHECK_VALID(NULL);
         slicelen = PySlice_AdjustIndices(self->size, &start, &stop, step);
 
         if (slicelen <= 0)
@@ -969,6 +970,8 @@ mmap_subscript(mmap_object *self, PyObject *item)
 
             if (result_buf == NULL)
                 return PyErr_NoMemory();
+            CHECK_VALID(NULL);
+
             for (cur = start, i = 0; i < slicelen;
                  cur += step, i++) {
                 result_buf[i] = self->data[cur];