Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detectNonAsciiUTF8 Don't regard null character as ascii

This commit is contained in:
halx99 2021-07-07 22:35:30 +08:00
parent 1cf4e82b80
commit fae361ba02
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/base/ccUTF8.cpp
View File

@ -362,15 +362,17 @@ bool detectNonAsciiUTF8(const char* str, size_t len, bool* pAllCharsAreAscii) {
bool allCharsAreAscii = true;
bool nonAsciiUTF8Found = false;
for (size_t i = 0; i < len;) {
int numByte = getNumBytesForUTF8(str[i]);
if (isLegalUTF8Sequence((const UTF8*) &str[i], (const UTF8*) &str[i] + numByte)) {
if (numByte > 1) {
auto& current = str[i];
int numByte = getNumBytesForUTF8(current);
if (numByte > 1) {
if (isLegalUTF8Sequence((const UTF8*) &current, (const UTF8*) &current + numByte)) {
nonAsciiUTF8Found = true;
allCharsAreAscii = false;
break;
}
} else { // not a valid utf-8 chars
allCharsAreAscii = false;
} else { // not a valid utf-8 chars
if ((current & 0x80) != 0 || current == 0)
allCharsAreAscii = false;
}
i += numByte;
}