shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one errors for stdlib unicode conversions.

Browse Source
This commit is contained in:
Christian Buttner
2024-06-23 22:51:59 +02:00
committed by Christoffer Lerno
parent 201b1b7fbc
commit 0b971c2bd0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/std/core/conv.c3
View File

@@ -108,14 +108,14 @@ fn usz char32_to_utf8_unsafe(Char32 c, char** output)
{
switch
{
case c < 0x7f:
case c <= 0x7f:
(*output)++[0] = (char)c;
return 1;
case c < 0x7ff:
case c <= 0x7ff:
(*output)++[0] = (char)(0xC0 | c >> 6);
(*output)++[0] = (char)(0x80 | (c & 0x3F));
return 2;
case c < 0xffff:
case c <= 0xffff:
(*output)++[0] = (char)(0xE0 | c >> 12);
(*output)++[0] = (char)(0x80 | (c >> 6 & 0x3F));
(*output)++[0] = (char)(0x80 | (c & 0x3F));
@@ -210,11 +210,11 @@ fn usz utf8len_for_utf32(Char32[] utf32)
{
switch (true)
{
case uc < 0x7f:
case uc <= 0x7f:
len++;
case uc < 0x7ff:
case uc <= 0x7ff:
len += 2;
case uc < 0xffff:
case uc <= 0xffff:
len += 3;
default:
len += 4;
@@ -237,12 +237,12 @@ fn usz utf8len_for_utf16(Char16[] utf16)
Char16 c = utf16[i];
if (c & UTF16_SURROGATE_GENERIC_MASK != UTF16_SURROGATE_GENERIC_VALUE)
{
if (c < 0x7f)
if (c <= 0x7f)
{
len++;
continue;
}
if (c < 0x7ff)
if (c <= 0x7ff)
{
len += 2;
continue;