mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #13333: The UTF-7 decoder now accepts lone surrogates

Browse source 
(the encoder already accepts them).
This commit is contained in:
Antoine Pitrou 2011-11-15 01:44:16 +01:00
commit 78edf7576e
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/unicodeobject.c
View file

@ -3884,21 +3884,18 @@ PyUnicode_DecodeUTF7Stateful(const char *s,
if (unicode_putchar(&unicode, &outpos, ch2) < 0)
goto onError;
surrogate = 0;
continue;
}
else {
if (unicode_putchar(&unicode, &outpos, surrogate) < 0)
goto onError;
surrogate = 0;
errmsg = "second surrogate missing";
goto utf7Error;
}
}
else if (outCh >= 0xD800 && outCh <= 0xDBFF) {
if (outCh >= 0xD800 && outCh <= 0xDBFF) {
/* first surrogate */
surrogate = outCh;
}
else if (outCh >= 0xDC00 && outCh <= 0xDFFF) {
errmsg = "unexpected second surrogate";
goto utf7Error;
}
else {
if (unicode_putchar(&unicode, &outpos, outCh) < 0)
goto onError;
@ -3909,8 +3906,9 @@ PyUnicode_DecodeUTF7Stateful(const char *s,
inShift = 0;
s++;
if (surrogate) {
errmsg = "second surrogate missing at end of shift sequence";
goto utf7Error;
if (unicode_putchar(&unicode, &outpos, surrogate) < 0)
goto onError;
surrogate = 0;
}
if (base64bits > 0) { /* left-over bits */
if (base64bits >= 6) {