Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 15:15:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where corrupt Unicode strings could crash the application.

Browse source
This commit is contained in:
Leon Styhre 2021-12-14 17:08:37 +01:00
parent b04c6d88a9
commit 5fd2c86c7d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
es-core/src/utils/StringUtil.cpp
View file

@ -306,7 +306,7 @@ namespace Utils
result = (stringArg[cursor++]); result = (stringArg[cursor++]);
} }
// 11110xxx, four byte character. // 11110xxx, four byte character.
else if (checkCharType >= 0xF0) { else if (checkCharType >= 0xF0 && cursor < stringArg.length() - 2) {
// 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
result = (stringArg[cursor++] & 0x07) << 18; result = (stringArg[cursor++] & 0x07) << 18;
result |= (stringArg[cursor++] & 0x3F) << 12; result |= (stringArg[cursor++] & 0x3F) << 12;
@ -314,14 +314,14 @@ namespace Utils
result |= stringArg[cursor++] & 0x3F; result |= stringArg[cursor++] & 0x3F;
} }
// 1110xxxx, three byte character. // 1110xxxx, three byte character.
else if (checkCharType >= 0xE0) { else if (checkCharType >= 0xE0 && cursor < stringArg.length() - 1) {
// 1110xxxx 10xxxxxx 10xxxxxx // 1110xxxx 10xxxxxx 10xxxxxx
result = (stringArg[cursor++] & 0x0F) << 12; result = (stringArg[cursor++] & 0x0F) << 12;
result |= (stringArg[cursor++] & 0x3F) << 6; result |= (stringArg[cursor++] & 0x3F) << 6;
result |= stringArg[cursor++] & 0x3F; result |= stringArg[cursor++] & 0x3F;
} }
// 110xxxxx, two byte character. // 110xxxxx, two byte character.
else if (checkCharType >= 0xC0) { else if (checkCharType >= 0xC0 && cursor < stringArg.length()) {
// 110xxxxx 10xxxxxx // 110xxxxx 10xxxxxx
result = (stringArg[cursor++] & 0x1F) << 6; result = (stringArg[cursor++] & 0x1F) << 6;
result |= stringArg[cursor++] & 0x3F; result |= stringArg[cursor++] & 0x3F;