summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-09-04 05:12:08 (GMT)
committerLarry Hastings <larry@hastings.org>2015-09-04 05:12:08 (GMT)
commit9f9a00afc028023cb67bc577606587fc163f7f2b (patch)
treefb16fde4cd18a51a2d340b91ddf27092dbc10eda /Lib
parenta43de00b74e458a2dd965a82c32b879c5084a490 (diff)
parent4e63f7a2b4e3602c420c8ae59a16020b14f8ee13 (diff)
downloadcpython-9f9a00afc028023cb67bc577606587fc163f7f2b.zip
cpython-9f9a00afc028023cb67bc577606587fc163f7f2b.tar.gz
cpython-9f9a00afc028023cb67bc577606587fc163f7f2b.tar.bz2
Merged in storchaka/cpython350 (pull request #13)
Issue #24989
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_memoryio.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index df4ff7a..44d66c3 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -166,6 +166,10 @@ class MemoryTestMixin:
memio.seek(0)
self.assertEqual(memio.read(None), buf)
self.assertRaises(TypeError, memio.read, '')
+ memio.seek(len(buf) + 1)
+ self.assertEqual(memio.read(1), self.EOF)
+ memio.seek(len(buf) + 1)
+ self.assertEqual(memio.read(), self.EOF)
memio.close()
self.assertRaises(ValueError, memio.read)
@@ -185,6 +189,9 @@ class MemoryTestMixin:
self.assertEqual(memio.readline(-1), buf)
memio.seek(0)
self.assertEqual(memio.readline(0), self.EOF)
+ # Issue #24989: Buffer overread
+ memio.seek(len(buf) * 2 + 1)
+ self.assertEqual(memio.readline(), self.EOF)
buf = self.buftype("1234567890\n")
memio = self.ioclass((buf * 3)[:-1])
@@ -217,6 +224,9 @@ class MemoryTestMixin:
memio.seek(0)
self.assertEqual(memio.readlines(None), [buf] * 10)
self.assertRaises(TypeError, memio.readlines, '')
+ # Issue #24989: Buffer overread
+ memio.seek(len(buf) * 10 + 1)
+ self.assertEqual(memio.readlines(), [])
memio.close()
self.assertRaises(ValueError, memio.readlines)
@@ -238,6 +248,9 @@ class MemoryTestMixin:
self.assertEqual(line, buf)
i += 1
self.assertEqual(i, 10)
+ # Issue #24989: Buffer overread
+ memio.seek(len(buf) * 10 + 1)
+ self.assertEqual(list(memio), [])
memio = self.ioclass(buf * 2)
memio.close()
self.assertRaises(ValueError, memio.__next__)