mirror of
https://github.com/DarkPlacesEngine/gmqcc.git
synced 2024-11-27 22:22:17 +00:00
u8_analyze: return false on any invalid character, we do not allow invalid/overlong characters in code at all
This commit is contained in:
parent
fe3d8e44e6
commit
aec2284f45
1 changed files with 10 additions and 4 deletions
14
utf8lib.c
14
utf8lib.c
|
@ -48,7 +48,7 @@ static bool u8_analyze(const char *_s, size_t *_start, size_t *_len, Uchar *_ch,
|
|||
Uchar ch;
|
||||
|
||||
i = 0;
|
||||
findchar:
|
||||
/* findchar: */
|
||||
while (i < _maxlen && s[i] && (bits = utf8_lengths[s[i]]) == 0)
|
||||
++i;
|
||||
|
||||
|
@ -71,14 +71,20 @@ findchar:
|
|||
if ( (s[i+j] & 0xC0) != 0x80 )
|
||||
{
|
||||
i += j;
|
||||
goto findchar;
|
||||
/* in gmqcc, invalid / overlong encodings are considered an error
|
||||
* goto findchar;
|
||||
*/
|
||||
return false;
|
||||
}
|
||||
ch = (ch << 6) | (s[i+j] & 0x3F);
|
||||
}
|
||||
if (ch < utf8_range[bits] || ch >= 0x10FFFF)
|
||||
{
|
||||
i += bits;
|
||||
goto findchar;
|
||||
/* same: error
|
||||
* i += bits;
|
||||
* goto findchar;
|
||||
*/
|
||||
return false;
|
||||
}
|
||||
|
||||
if (_start)
|
||||
|
|
Loading…
Reference in a new issue