summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-03 21:03:39 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-03 21:03:39 (GMT)
commit540da76115f46da48e39d3685739afc284cfbddb (patch)
tree2c44bcea737de9702baba6531b42331179b962a9 /Python
parent8af179e7447fb55bb13d0a7d7cfddbdc72e69b2c (diff)
downloadcpython-540da76115f46da48e39d3685739afc284cfbddb.zip
cpython-540da76115f46da48e39d3685739afc284cfbddb.tar.gz
cpython-540da76115f46da48e39d3685739afc284cfbddb.tar.bz2
#16336: fix input checking in the surrogatepass error handler. Patch by Serhiy Storchaka.
Diffstat (limited to 'Python')
-rw-r--r--Python/codecs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/codecs.c b/Python/codecs.c
index 90f1cf6..e21834a 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -821,10 +821,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)