Merged revisions 86587 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86587 | benjamin.peterson | 2010-11-20 11:24:04 -0600 (Sat, 20 Nov 2010) | 1 line

  correct logic when pos is after the string #10467
........

diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 2b4c76e8f9aafb168d57e7c7b214e4244fdd3c9d..8d95a64adcc630293200e135d954ab90b6c6cf7b 100644 (file)
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -438,6 +438,11 @@ class PyBytesIOTest(MemoryTestMixin, MemorySeekTestMixin, unittest.TestCase):
         self.assertEqual(a.tostring(), b"1234567890d")
         memio.close()
         self.assertRaises(ValueError, memio.readinto, b)
+        memio = self.ioclass(b"123")
+        b = bytearray()
+        memio.seek(42)
+        memio.readinto(b)
+        self.assertEqual(b, b"")
 
     def test_relative_seek(self):
         buf = self.buftype("1234567890")

diff --git a/Misc/NEWS b/Misc/NEWS
index 3a984f46a0069108b548bc23b77f3cb839e3d416..b04fc6abec534bbf72b4c08f8bca7be7eeebd016 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@ Library
 - Issue #10198: fix duplicate header written to wave files when writeframes()
   is called without data.
 
+- Issue #10467: Fix BytesIO.readinto() after seeking into a position after the
+  end of the file.
+
 - Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru.
 
 Build

diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index 15dbc338f87953b9ea1f35c71063a4218d235f72..51fad21383bff313da0aeebaa7ff08ab2e8f7815 100644 (file)
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -391,7 +391,7 @@ static PyObject *
 bytesio_readinto(bytesio *self, PyObject *args)
 {
     Py_buffer buf;
-    Py_ssize_t len;
+    Py_ssize_t len, n;
 
     CHECK_CLOSED(self);
 
@@ -399,8 +399,13 @@ bytesio_readinto(bytesio *self, PyObject *args)
         return NULL;
 
     len = buf.len;
-    if (self->pos + len > self->string_size)
-        len = self->string_size - self->pos;
+    /* adjust invalid sizes */
+    n = self->string_size - self->pos;
+    if (len > n) {
+        len = n;
+        if (len < 0)
+            len = 0;
+    }
 
     memcpy(buf.buf, self->buf + self->pos, len);
     assert(self->pos + len < PY_SSIZE_T_MAX);