[Python-checkins] bpo-24214: Fixed the UTF-8 incremental decoder. (GH-12603)
Serhiy Storchaka
webhook-mailer at python.org
Sat Mar 30 02:23:43 EDT 2019
https://github.com/python/cpython/commit/7a465cb5ee7e298cae626ace1fc3e7d97df79f2e
commit: 7a465cb5ee7e298cae626ace1fc3e7d97df79f2e
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-03-30T08:23:38+02:00
summary:
bpo-24214: Fixed the UTF-8 incremental decoder. (GH-12603)
The bug occurred when the encoded surrogate character is passed
to the incremental decoder in two chunks.
files:
A Misc/NEWS.d/next/Core and Builtins/2019-03-28-15-22-45.bpo-24214.tZ6lYU.rst
M Lib/test/test_codecs.py
M Objects/unicodeobject.c
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 331449397e37..05843c54bd5f 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -406,6 +406,15 @@ def test_lone_surrogates(self):
self.assertEqual(test_sequence.decode(self.encoding, "backslashreplace"),
before + backslashreplace + after)
+ def test_incremental_surrogatepass(self):
+ # Test incremental decoder for surrogatepass handler:
+ # see issue #24214
+ data = '\uD901'.encode(self.encoding, 'surrogatepass')
+ for i in range(1, len(data)):
+ dec = codecs.getincrementaldecoder(self.encoding)('surrogatepass')
+ self.assertEqual(dec.decode(data[:i]), '')
+ self.assertEqual(dec.decode(data[i:], True), '\uD901')
+
class UTF32Test(ReadTest, unittest.TestCase):
encoding = "utf-32"
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-03-28-15-22-45.bpo-24214.tZ6lYU.rst b/Misc/NEWS.d/next/Core and Builtins/2019-03-28-15-22-45.bpo-24214.tZ6lYU.rst
new file mode 100644
index 000000000000..abb27591f78a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-03-28-15-22-45.bpo-24214.tZ6lYU.rst
@@ -0,0 +1,2 @@
+Fixed support of the surrogatepass error handler in the UTF-8 incremental
+decoder.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8ab3943e61b2..c0b345be7e8d 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4883,6 +4883,9 @@ PyUnicode_DecodeUTF8Stateful(const char *s,
case 2:
case 3:
case 4:
+ if (s == end || consumed) {
+ goto End;
+ }
errmsg = "invalid continuation byte";
startinpos = s - starts;
endinpos = startinpos + ch - 1;
More information about the Python-checkins
mailing list