Oh, and there is yet one bug. "&&" should be used in the condition
instead of "||". Patch attached.
diff -r 8e67d5dc069d Python/codecs.c
--- a/Python/codecs.c Fri Oct 26 17:05:55 2012 -0700
+++ b/Python/codecs.c Sat Oct 27 12:41:45 2012 +0300
@@ -791,10 +791,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)
_______________________________________________
Python-Dev mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com