gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CHARLEN and CHARSUB on invalid UTF-8 (#1630)

Browse Source
This commit is contained in:
Rangi
2025-01-28 02:01:18 -05:00
committed by GitHub
parent d54619a453
commit 44caffe04a
4 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/asm/charmap.cpp
View File

@@ -227,24 +227,22 @@ size_t charmap_ConvertNext(std::string_view &input, std::vector<int32_t> *output
} else if (inputIdx < input.length()) { // No match found, but there is some input left
size_t codepointLen = 0;
// This will write the codepoint's value to `output`, little-endian
for (uint32_t state = 0, codepoint = 0;;) {
for (uint32_t state = 0, codepoint = 0; inputIdx + codepointLen < input.length();) {
if (decode(&state, &codepoint, input[inputIdx + codepointLen]) == 1) {
codepointLen = 0;
error("Input string is not valid UTF-8\n");
codepointLen = 1;
break;
}
if (output) {
output->push_back(input[inputIdx + codepointLen]);
}
codepointLen++;
if (state == 0) {
break;
}
}
if (codepointLen == 0) {
error("Input string is not valid UTF-8\n");
if (output) {
output->insert(
output->end(), input.data() + inputIdx, input.data() + inputIdx + codepointLen
);
}
// Warn if this character is not mapped but any others are