summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_io.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-02-03 15:03:31 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-02-03 15:03:31 (GMT)
commit94dc6736bd4a72e9af36d4df1c337bd0db5fd69c (patch)
tree60540d3aa3d7a675c254b3b03541953422758e69 /Lib/test/test_io.py
parent028915e6ea331a90edc263e7894dc02785048449 (diff)
downloadcpython-94dc6736bd4a72e9af36d4df1c337bd0db5fd69c.zip
cpython-94dc6736bd4a72e9af36d4df1c337bd0db5fd69c.tar.gz
cpython-94dc6736bd4a72e9af36d4df1c337bd0db5fd69c.tar.bz2
Issue #17106: Fix a segmentation fault in io.TextIOWrapper when an underlying
stream or a decoder produces data of an unexpected type (i.e. when io.TextIOWrapper initialized with text stream or use bytes-to-bytes codec).
Diffstat (limited to 'Lib/test/test_io.py')
-rw-r--r--Lib/test/test_io.py24
1 files changed, 24 insertions, 0 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 249dc30..a7e596a 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2481,6 +2481,30 @@ class TextIOWrapperTest(unittest.TestCase):
txt.write('5')
self.assertEqual(b''.join(raw._write_stack), b'123\n45')
+ def test_read_nonbytes(self):
+ # Issue #17106
+ # Crash when underlying read() returns non-bytes
+ t = self.TextIOWrapper(self.StringIO('a'))
+ self.assertRaises(TypeError, t.read, 1)
+ t = self.TextIOWrapper(self.StringIO('a'))
+ self.assertRaises(TypeError, t.readline)
+ t = self.TextIOWrapper(self.StringIO('a'))
+ self.assertRaises(TypeError, t.read)
+
+ def test_illegal_decoder(self):
+ # Issue #17106
+ # Crash when decoder returns non-string
+ t = self.TextIOWrapper(self.BytesIO(b'aaaaaa'), newline='\n',
+ encoding='quopri_codec')
+ self.assertRaises(TypeError, t.read, 1)
+ t = self.TextIOWrapper(self.BytesIO(b'aaaaaa'), newline='\n',
+ encoding='quopri_codec')
+ self.assertRaises(TypeError, t.readline)
+ t = self.TextIOWrapper(self.BytesIO(b'aaaaaa'), newline='\n',
+ encoding='quopri_codec')
+ self.assertRaises(TypeError, t.read)
+
+
class CTextIOWrapperTest(TextIOWrapperTest):
def test_initialization(self):