diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 21:05:18 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 21:05:18 (GMT) |
| commit | 1e58ae44dfb60c6cb87a072498a68eb10e416279 (patch) | |
| tree | f82653dae05c03bc3fd4a2936fe4bbeeb849d6b9 | |
| parent | 51f61b93db406a5d65ab964f0a6c0c0e8e8e7515 (diff) | |
| parent | a0b5c46fa22bbeac1b8ad9ed177f8285297de3cd (diff) | |
| download | cpython-1e58ae44dfb60c6cb87a072498a68eb10e416279.zip cpython-1e58ae44dfb60c6cb87a072498a68eb10e416279.tar.gz cpython-1e58ae44dfb60c6cb87a072498a68eb10e416279.tar.bz2 | |
#16336: merge with 3.3.
| -rw-r--r-- | Lib/test/test_codecs.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/codecs.c | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 93660f7..f2a1ae3 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -668,6 +668,8 @@ class UTF8Test(ReadTest): self.assertTrue(codecs.lookup_error("surrogatepass")) with self.assertRaises(UnicodeDecodeError): b"abc\xed\xa0".decode("utf-8", "surrogatepass") + with self.assertRaises(UnicodeDecodeError): + b"abc\xed\xa0z".decode("utf-8", "surrogatepass") @unittest.skipUnless(sys.platform == 'win32', 'cp65001 is a Windows-only codec') @@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1? Core and Builtins ----------------- +- Issue #16336: fix input checking in the surrogatepass error handler. + Patch by Serhiy Storchaka. + - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now raises an error. diff --git a/Python/codecs.c b/Python/codecs.c index 5cfb1c9..37ae41b 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -791,10 +791,10 @@ PyCodec_SurrogatePassErrors(PyObject *exc) /* Try decoding a single surrogate character. If there are more, let the codec call us again. */ p += start; - if (strlen(p) > 2 && - ((p[0] & 0xf0) == 0xe0 || - (p[1] & 0xc0) == 0x80 || - (p[2] & 0xc0) == 0x80)) { + if (PyBytes_GET_SIZE(object) - start >= 3 && + (p[0] & 0xf0) == 0xe0 && + (p[1] & 0xc0) == 0x80 && + (p[2] & 0xc0) == 0x80) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); if (!Py_UNICODE_IS_SURROGATE(ch)) |