From 1d8d515343d45a1e5326ff830b1e7282be0d0f9e Mon Sep 17 00:00:00 2001 From: MaxGraey Date: Tue, 2 Nov 2021 14:09:22 +0200 Subject: [PATCH 1/2] simplify stringLengthUTF8 more --- src/module.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/module.ts b/src/module.ts index 791ecdb27a..2f0c8bfa30 100644 --- a/src/module.ts +++ b/src/module.ts @@ -3107,7 +3107,6 @@ function stringLengthUTF8(str: string): usize { } else if (u <= 0x7FF) { len += 2; } else if (u >= 0xD800 && u <= 0xDFFF && i + 1 < k) { - u = 0x10000 + ((u & 0x3FF) << 10) | (str.charCodeAt(++i) & 0x3FF); len += 4; } else { len += 3; From b8485f40c5fb8d859d01d777aed60aef172dc8bc Mon Sep 17 00:00:00 2001 From: MaxGraey Date: Tue, 2 Nov 2021 14:11:25 +0200 Subject: [PATCH 2/2] fix --- src/module.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/module.ts b/src/module.ts index 2f0c8bfa30..66a2ad14ea 100644 --- a/src/module.ts +++ b/src/module.ts @@ -3107,6 +3107,7 @@ function stringLengthUTF8(str: string): usize { } else if (u <= 0x7FF) { len += 2; } else if (u >= 0xD800 && u <= 0xDFFF && i + 1 < k) { + i++; len += 4; } else { len += 3;