Merged revisions 70879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70879 | hirokazu.yamamoto | 2009-04-01 05:14:04 +0900 | 1 line
Issue #5387: Fixed mmap.move crash by integer overflow. (take2)
........
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 2e03673..a2e9f72 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -1,7 +1,7 @@
from test.support import TESTFN, run_unittest
import mmap
import unittest
-import os, re
+import os, re, itertools
PAGESIZE = mmap.PAGESIZE
@@ -347,9 +347,21 @@
self.assertEqual(m[:], expected)
m.close()
- # should not crash
- m = mmap.mmap(-1, 1)
- self.assertRaises(ValueError, m.move, 1, 1, -1)
+ # segfault test (Issue 5387)
+ m = mmap.mmap(-1, 100)
+ offsets = [-100, -1, 0, 1, 100]
+ for source, dest, size in itertools.product(offsets, offsets, offsets):
+ try:
+ m.move(source, dest, size)
+ except ValueError:
+ pass
+ self.assertRaises(ValueError, m.move, -1, -1, -1)
+ self.assertRaises(ValueError, m.move, -1, -1, 0)
+ self.assertRaises(ValueError, m.move, -1, 0, -1)
+ self.assertRaises(ValueError, m.move, 0, -1, -1)
+ self.assertRaises(ValueError, m.move, -1, 0, 0)
+ self.assertRaises(ValueError, m.move, 0, -1, 0)
+ self.assertRaises(ValueError, m.move, 0, 0, -1)
m.close()
def test_anonymous(self):