pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-27 13:26:38 +02:00
Code Activity

core: overlong UTF-8 encoding and surrogates (U+D800-DFFF) are invalid.

Browse Source
This commit is contained in:
Anders Bergh
2014-06-16 22:24:46 +02:00
parent d65afdfc7c
commit b705e20a44
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-utf8.c
+22 -23
View File
@@ -79,59 +79,58 @@ utf8_has_8bits (const char *string)
int
utf8_is_valid (const char *string, char **error)
{
int n;
while (string && string[0])
{
/* UTF-8, 2 bytes, should be: 110vvvvv 10vvvvvv */
/* UTF-8, 2 bytes, should be: 110vvvvv 10vvvvvv and U+0080-07FF */
if (((unsigned char)(string[0]) & 0xE0) == 0xC0)
{
if (!string[1] || (((unsigned char)(string[1]) & 0xC0) != 0x80))
{
if (error)
*error = (char *)string;
return 0;
}
goto err;
n = utf8_char_int(string);
if (n < 0x80 || n > 0x7ff)
goto err;
string += 2;
}
/* UTF-8, 3 bytes, should be: 1110vvvv 10vvvvvv 10vvvvvv */
/* UTF-8, 3 bytes, should be: 1110vvvv 10vvvvvv 10vvvvvv and U+0800-FFFF */
else if (((unsigned char)(string[0]) & 0xF0) == 0xE0)
{
if (!string[1] || !string[2]
|| (((unsigned char)(string[1]) & 0xC0) != 0x80)
|| (((unsigned char)(string[2]) & 0xC0) != 0x80))
{
if (error)
*error = (char *)string;
return 0;
}
goto err;
n = utf8_char_int(string);
if (n < 0x800 || n > 0xffff || (n >= 0xd800 && n <= 0xdfff))
goto err;
string += 3;
}
/* UTF-8, 4 bytes, should be: 11110vvv 10vvvvvv 10vvvvvv 10vvvvvv */
/* UTF-8, 4 bytes, should be: 11110vvv 10vvvvvv 10vvvvvv 10vvvvvv and U+10000-1FFFFF */
else if (((unsigned char)(string[0]) & 0xF8) == 0xF0)
{
if (!string[1] || !string[2] || !string[3]
|| (((unsigned char)(string[1]) & 0xC0) != 0x80)
|| (((unsigned char)(string[2]) & 0xC0) != 0x80)
|| (((unsigned char)(string[3]) & 0xC0) != 0x80))
{
if (error)
*error = (char *)string;
return 0;
}
goto err;
n = utf8_char_int(string);
if (n < 0x10000 || n > 0x1fffff)
goto err;
string += 4;
}
/* UTF-8, 1 byte, should be: 0vvvvvvv */
else if ((unsigned char)(string[0]) >= 0x80)
{
if (error)
*error = (char *)string;
return 0;
}
goto err;
else
string++;
}
if (error)
*error = NULL;
return 1;
err:
if (error)
*error = (char *)string;
return 0;
}
/*