diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 23:05:18 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 23:05:18 +0200 |
| commit | e89c09300e158e886e1ac6a5ec1215d98e067375 (patch) | |
| tree | e7ef937b1c26078a2f9ba7bd6a39e5009019c943 /Python/codecs.c | |
| parent | 46f36c8eeef40dc1b68be5514ed8b52c14c374a2 (diff) | |
| parent | dcaee5a754de86313e0a917d762172ac6fa9682d (diff) | |
| download | cpython-e89c09300e158e886e1ac6a5ec1215d98e067375.tar.gz | |
#16336: merge with 3.3.
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index 5cfb1c9001..37ae41b1ca 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)) |