traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reuse surrogate macros in UTF-16 decoder

This commit is contained in:
Victor Stinner 2011-11-20 18:40:27 +01:00
parent 9343999597
commit 2e9cfadd7c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/unicodeobject.c
View File

@ -5339,13 +5339,12 @@ PyUnicode_DecodeUTF16Stateful(const char *s,
endinpos = ((const char *)e) + 1 - starts; endinpos = ((const char *)e) + 1 - starts;
goto utf16Error; goto utf16Error;
} }
if (0xD800 <= ch && ch <= 0xDBFF) { if (Py_UNICODE_IS_HIGH_SURROGATE(ch)) {
Py_UNICODE ch2 = (q[ihi] << 8) | q[ilo]; Py_UCS4 ch2 = (q[ihi] << 8) | q[ilo];
q += 2; q += 2;
if (0xDC00 <= ch2 && ch2 <= 0xDFFF) { if (Py_UNICODE_IS_LOW_SURROGATE(ch2)) {
if (unicode_putchar(&unicode, &outpos, if (unicode_putchar(&unicode, &outpos,
(((ch & 0x3FF)<<10) | Py_UNICODE_JOIN_SURROGATES(ch, ch2)) < 0)
(ch2 & 0x3FF)) + 0x10000) < 0)
goto onError; goto onError;
continue; continue;
} }