[Python-checkins] r70055 - in python/branches/release30-maint: Lib/test/test_mmap.py Misc/NEWS Modules/mmapmodule.c

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Sat Feb 28 12:50:11 2009
New Revision: 70055

Log:
Merged revisions 70053 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r70053 | hirokazu.yamamoto | 2009-02-28 19:56:50 +0900 | 10 lines
  
  Merged revisions 70052 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r70052 | hirokazu.yamamoto | 2009-02-28 19:31:54 +0900 | 2 lines
    
    Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer
    overrun.
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/test/test_mmap.py
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Modules/mmapmodule.c

Modified: python/branches/release30-maint/Lib/test/test_mmap.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_mmap.py	(original)
+++ python/branches/release30-maint/Lib/test/test_mmap.py	Sat Feb 28 12:50:11 2009
@@ -466,6 +466,44 @@
         self.assert_(issubclass(mmap.error, EnvironmentError))
         self.assert_("mmap.error" in str(mmap.error))
 
+    def test_io_methods(self):
+        data = b"0123456789"
+        open(TESTFN, "wb").write(b"x"*len(data))
+        f = open(TESTFN, "r+b")
+        m = mmap.mmap(f.fileno(), len(data))
+        f.close()
+        # Test write_byte()
+        for i in range(len(data)):
+            self.assertEquals(m.tell(), i)
+            m.write_byte(data[i:i+1])
+            self.assertEquals(m.tell(), i+1)
+        self.assertRaises(ValueError, m.write_byte, b"x")
+        self.assertEquals(m[:], data)
+        # Test read_byte()
+        m.seek(0)
+        for i in range(len(data)):
+            self.assertEquals(m.tell(), i)
+            # XXX: Disable this test for now because it's not clear
+            # which type of object m.read_byte returns. Currently, it
+            # returns 1-length str (unicode).
+            if 0:
+                self.assertEquals(m.read_byte(), data[i:i+1])
+            else:
+                m.read_byte()
+            self.assertEquals(m.tell(), i+1)
+        self.assertRaises(ValueError, m.read_byte)
+        # Test read()
+        m.seek(3)
+        self.assertEquals(m.read(3), b"345")
+        self.assertEquals(m.tell(), 6)
+        # Test write()
+        m.seek(3)
+        m.write(b"bar")
+        self.assertEquals(m.tell(), 6)
+        self.assertEquals(m[:], b"012bar6789")
+        m.seek(8)
+        self.assertRaises(ValueError, m.write, b"bar")
+
 
 def test_main():
     run_unittest(MmapTests)

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sat Feb 28 12:50:11 2009
@@ -147,6 +147,9 @@
 Library
 -------
 
+- Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer
+  overrun.
+
 - Issue #4998: The memory saving effect of __slots__ had been lost on Fractions
   which inherited from numbers.py which did not have __slots__ defined.  The
   numbers hierarchy now has its own __slots__ declarations.

Modified: python/branches/release30-maint/Modules/mmapmodule.c
==============================================================================
--- python/branches/release30-maint/Modules/mmapmodule.c	(original)
+++ python/branches/release30-maint/Modules/mmapmodule.c	Sat Feb 28 12:50:11 2009
@@ -376,10 +376,17 @@
 
 	if (!is_writable(self))
 		return NULL;
-	*(self->data+self->pos) = value;
-	self->pos += 1;
-	Py_INCREF(Py_None);
-	return Py_None;
+
+	if (self->pos < self->size) {
+		*(self->data+self->pos) = value;
+		self->pos += 1;
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+	else {
+		PyErr_SetString(PyExc_ValueError, "write byte out of range");
+		return NULL;
+	}
 }
 
 static PyObject *