#16336: fix input checking in the surrogatepass error handler. Patch by Serhiy Storchaka.
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 @@
/* 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)