Mercurial > cpython-lru_cache-weakref
diff Python/ast.c @ 56956:844180b7e6ff legacy-trunk
do a backport of r75928
The added test does not fail without the patch, but we still fix the issue of
surrogates being used in wide builds where they should not be.
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Thu, 29 Oct 2009 01:49:07 +0000 |
| parents | e99adfc92dc2 |
| children | ed30bcffa146 |
line wrap: on
line diff
--- a/Python/ast.c Wed Oct 28 23:28:16 2009 +0000 +++ b/Python/ast.c Thu Oct 29 01:49:07 2009 +0000 @@ -3289,10 +3289,11 @@ u = NULL; } else { /* check for integer overflow */ - if (len > PY_SIZE_MAX / 4) + if (len > PY_SIZE_MAX / 6) return NULL; - /* "\XX" may become "\u005c\uHHLL" (12 bytes) */ - u = PyString_FromStringAndSize((char *)NULL, len * 4); + /* "<C3><A4>" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5 + "\รค" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */ + u = PyString_FromStringAndSize((char *)NULL, len * 6); if (u == NULL) return NULL; p = buf = PyString_AsString(u); @@ -3309,19 +3310,21 @@ PyObject *w; char *r; Py_ssize_t rn, i; - w = decode_utf8(c, &s, end, "utf-16-be"); + w = decode_utf8(c, &s, end, "utf-32-be"); if (w == NULL) { Py_DECREF(u); return NULL; } r = PyString_AsString(w); rn = PyString_Size(w); - assert(rn % 2 == 0); - for (i = 0; i < rn; i += 2) { - sprintf(p, "\\u%02x%02x", + assert(rn % 4 == 0); + for (i = 0; i < rn; i += 4) { + sprintf(p, "\\U%02x%02x%02x%02x", r[i + 0] & 0xFF, - r[i + 1] & 0xFF); - p += 6; + r[i + 1] & 0xFF, + r[i + 2] & 0xFF, + r[i + 3] & 0xFF); + p += 10; } Py_DECREF(w); } else {