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

Fixed an issue where a leading Unicode character in the game name could crash the application.

Browse source
This commit is contained in:
Leon Styhre 2021-01-16 17:22:12 +01:00
parent 8dc23e2114
commit 43da188b3b
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
es-app/src/guis/GuiGamelistOptions.cpp
View file

@ -92,10 +92,20 @@ GuiGamelistOptions::GuiGamelistOptions(
ViewController::FAVORITE_CHAR)) ViewController::FAVORITE_CHAR))
isFavorite = true; isFavorite = true;
if (mFavoritesSorting && file->getFavorite() && isFavorite) if (mFavoritesSorting && file->getFavorite() && isFavorite) {
mCurrentFirstCharacter = ViewController::FAVORITE_CHAR; mCurrentFirstCharacter = ViewController::FAVORITE_CHAR;
else }
mCurrentFirstCharacter = toupper(file->getSortName().front()); else {
unsigned char checkCharType = file->getSortName().front();
if (checkCharType <= 0x7F) // Normal ASCII character.
mCurrentFirstCharacter = toupper(file->getSortName().front());
else if (checkCharType >= 0xF0) // Four-byte Unicode character.
mCurrentFirstCharacter = file->getSortName().substr(0, 4);
else if (checkCharType >= 0xE0) // Three-byte Unicode character.
mCurrentFirstCharacter = file->getSortName().substr(0, 3);
else if (checkCharType >= 0xC0) // Two-byte Unicode character.
mCurrentFirstCharacter = file->getSortName().substr(0, 2);
}
} }
mJumpToLetterList = std::make_shared<LetterList>(mWindow, getHelpStyle(), mJumpToLetterList = std::make_shared<LetterList>(mWindow, getHelpStyle(),

10
es-app/src/views/gamelist/ISimpleGameListView.cpp
View file

@ -489,7 +489,15 @@ void ISimpleGameListView::generateFirstLetterIndex(const std::vector<FileData*>&
hasFavorites = true; hasFavorites = true;
} }
else { else {
firstChar = toupper((*it)->getSortName().front()); unsigned char checkCharType = (*it)->getSortName().front();
if (checkCharType <= 0x7F) // Normal ASCII character.
firstChar = toupper((*it)->getSortName().front());
else if (checkCharType >= 0xF0) // Four-byte Unicode character.
firstChar = (*it)->getSortName().substr(0, 4);
else if (checkCharType >= 0xE0) // Three-byte Unicode character.
firstChar = (*it)->getSortName().substr(0, 3);
else if (checkCharType >= 0xC0) // Two-byte Unicode character.
firstChar = (*it)->getSortName().substr(0, 2);
mFirstLetterIndex.push_back(firstChar); mFirstLetterIndex.push_back(firstChar);
} }
} }