diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 23:04:41 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 23:04:41 +0200 |
| commit | dcaee5a754de86313e0a917d762172ac6fa9682d (patch) | |
| tree | 4d5210a02dcdfff65225dced90f070502d278d72 /Python/codecs.c | |
| parent | 1a60c7a058d2b7cb5d844845e32376cef0c9b8f9 (diff) | |
| parent | c26a84f6e032a34e6a3b8f6f1182320b75359a06 (diff) | |
| download | cpython-dcaee5a754de86313e0a917d762172ac6fa9682d.tar.gz | |
#16336: merge with 3.2.
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 5470500577..fd67d1b9e1 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 (ch < 0xd800 || ch > 0xdfff) |