summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-09-17 11:28:09 (GMT)
committerGeorg Brandl <georg@python.org>2009-09-17 11:28:09 (GMT)
commite9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a (patch)
tree7abc5212bc70ad2f5a217a038681cae4fd71d9d4 /Lib
parentbc3777d85e9f73bb8e541faf91103fb2374628a3 (diff)
downloadcpython-e9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a.zip
cpython-e9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a.tar.gz
cpython-e9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a.tar.bz2
Issue #6922: Fix an infinite loop when trying to decode an invalid
UTF-32 stream with a non-raising error handler like "replace" or "ignore".
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_codecs.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 06cab1c..1893311 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -305,6 +305,12 @@ class UTF32Test(ReadTest):
]
)
+ def test_handlers(self):
+ self.assertEqual((u'\ufffd', 1),
+ codecs.utf_32_decode('\x01', 'replace', True))
+ self.assertEqual((u'', 1),
+ codecs.utf_32_decode('\x01', 'ignore', True))
+
def test_errors(self):
self.assertRaises(UnicodeDecodeError, codecs.utf_32_decode,
"\xff", "strict", True)
@@ -422,6 +428,12 @@ class UTF16Test(ReadTest):
]
)
+ def test_handlers(self):
+ self.assertEqual((u'\ufffd', 1),
+ codecs.utf_16_decode('\x01', 'replace', True))
+ self.assertEqual((u'', 1),
+ codecs.utf_16_decode('\x01', 'ignore', True))
+
def test_errors(self):
self.assertRaises(UnicodeDecodeError, codecs.utf_16_decode, "\xff", "strict", True)