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

Make invalid UTF-8 characters in strings non-fatal

Browse Source 
STRLEN and STRSUB report the erroneous bytes

Fixes #848
This commit is contained in:
Rangi
2021-04-20 12:24:01 -04:00
committed by Eldred Habert
parent e596dbfc80
commit 4d21588eb2
5 changed files with 92 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/asm/parser.y
View File

@@ -82,16 +82,24 @@ static char *strrstr(char *s1, char *s2)
return NULL;
}
static void errorInvalidUTF8Byte(uint8_t byte, char const *functionName)
{
error("%s: Invalid UTF-8 byte 0x%02hhX\n", functionName, byte);
}
static size_t strlenUTF8(char const *s)
{
size_t len = 0;
uint32_t state = 0;
for (uint32_t codep = 0; *s; s++) {
switch (decode(&state, &codep, *s)) {
uint8_t byte = *s;
switch (decode(&state, &codep, byte)) {
case 1:
fatalerror("STRLEN: Invalid UTF-8 character\n");
break;
errorInvalidUTF8Byte(byte, "STRLEN");
state = 0;
/* fallthrough */
case 0:
len++;
break;
@@ -100,7 +108,7 @@ static size_t strlenUTF8(char const *s)
/* Check for partial code point. */
if (state != 0)
fatalerror("STRLEN: Invalid UTF-8 character\n");
error("STRLEN: Incomplete UTF-8 character\n");
return len;
}
@@ -116,14 +124,16 @@ static void strsubUTF8(char *dest, size_t destLen, char const *src, uint32_t pos
/* Advance to starting position in source string. */
while (src[srcIndex] && curPos < pos) {
switch (decode(&state, &codep, src[srcIndex++])) {
switch (decode(&state, &codep, src[srcIndex])) {
case 1:
fatalerror("STRSUB: Invalid UTF-8 character\n");
break;
errorInvalidUTF8Byte(src[srcIndex], "STRSUB");
state = 0;
/* fallthrough */
case 0:
curPos++;
break;
}
srcIndex++;
}
/*
@@ -138,8 +148,9 @@ static void strsubUTF8(char *dest, size_t destLen, char const *src, uint32_t pos
while (src[srcIndex] && destIndex < destLen - 1 && curLen < len) {
switch (decode(&state, &codep, src[srcIndex])) {
case 1:
fatalerror("STRSUB: Invalid UTF-8 character\n");
break;
errorInvalidUTF8Byte(src[srcIndex], "STRSUB");
state = 0;
/* fallthrough */
case 0:
curLen++;
break;
@@ -152,7 +163,7 @@ static void strsubUTF8(char *dest, size_t destLen, char const *src, uint32_t pos
/* Check for partial code point. */
if (state != 0)
fatalerror("STRSUB: Invalid UTF-8 character\n");
error("STRSUB: Incomplete UTF-8 character\n");
dest[destIndex] = '\0';
}