diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-11-03 17:09:22 -0400 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-11-03 17:09:22 -0400 |
| commit | a113e018fced52ace2157b6fe9af9f731af0e9ac (patch) | |
| tree | f2b303c3aa749ddac037e07671861872109f0340 /Python/codecs.c | |
| parent | 8f423c9359f75d26ee20c1e18f002743046abd72 (diff) | |
| parent | a0b5c46fa22bbeac1b8ad9ed177f8285297de3cd (diff) | |
| download | cpython-git-a113e018fced52ace2157b6fe9af9f731af0e9ac.tar.gz | |
Branch merge
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) |