libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-30 21:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Fix UTF-16 decoding

Browse Source 
In case of 4-bytes codepoints, length wasn't decreased.
If codepoint is invalid don't eat the second code unit to let
resynchronization happen.
This commit is contained in:
Le Philousophe 2020-12-01 19:43:20 +01:00
parent f744d41515
commit 58f728a042
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/str-enc.cpp
View File

@ -621,22 +621,26 @@ void String::encodeUTF8(const U32String &src) {
}
#define decodeUTF16Template(suffix, read) \
Common::U32String U32String::decodeUTF16 ## suffix (const uint16 *start, uint len) { \
Common::U32String U32String::decodeUTF16 ## suffix (const uint16 *start, uint len) { \
const uint16 *ptr = start; \
Common::U32String dst; \
dst.ensureCapacity(len, false); \
\
while (len-- > 0) { \
while (len > 0) { \
uint16 c = read(ptr++); \
len--; \
if (c >= 0xD800 && c <= 0xDBFF && len > 0) { \
uint16 low = read(ptr++); \
if (low >= 0xDC00 && low <= 0xDFFF) \
dst += ((c & 0x3ff) << 10) \
| (low & 0x3ff); \
else \
uint16 low = read(ptr); \
if (low >= 0xDC00 && low <= 0xDFFF) { \
/* low is OK, we can advance pointer */ \
ptr++; len--; \
dst += ((c & 0x3ff) << 10) \
| (low & 0x3ff); \
} else { \
dst += invalidCode; \
} \
continue; \
} \
} \
\
if (c >= 0xD800 && c <= 0xDFFF) { \
dst += invalidCode; \
@ -668,7 +672,7 @@ uint16 *U32String::encodeUTF16 ## suffix (uint *len) const { \
} \
\
write(ptr, 0); \
if (len) \
if (len) \
*len = ptr - out; \
\
return out; \