[Python-checkins] r70884 - in python/branches/py3k: Lib/test/test_mmap.py Modules/mmapmodule.c

Tue Mar 31 22:43:56 CEST 2009

Author: hirokazu.yamamoto
Date: Tue Mar 31 22:43:56 2009
New Revision: 70884
Log:
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)
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/test/test_mmap.py
 python/branches/py3k/Modules/mmapmodule.c
Modified: python/branches/py3k/Lib/test/test_mmap.py
==============================================================================

--- python/branches/py3k/Lib/test/test_mmap.py	(original)
+++ python/branches/py3k/Lib/test/test_mmap.py	Tue Mar 31 22:43:56 2009
@@ -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):
Modified: python/branches/py3k/Modules/mmapmodule.c
==============================================================================
--- python/branches/py3k/Modules/mmapmodule.c	(original)
+++ python/branches/py3k/Modules/mmapmodule.c	Tue Mar 31 22:43:56 2009
@@ -628,7 +628,7 @@
 	} else {
 		/* bounds check the values */
 		unsigned long pos = src > dest ? src : dest;
-		if (self->size >= pos && count > self->size - pos) {
+		if (self->size < pos || count > self->size - pos) {
 			PyErr_SetString(PyExc_ValueError,
 					"source or destination out of range");
 			return NULL;
