aboutsummaryrefslogtreecommitdiff
path: root/ext/js/data/sandbox
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2022-08-20 14:32:34 -0400
committerGitHub <noreply@github.com>2022-08-20 14:32:34 -0400
commite7944d29b0380d46e44cc316e10a3088e9da3a8c (patch)
tree1df918c6e507d7b881356f44e36733acb5489792 /ext/js/data/sandbox
parent4194252fe363e9737abf4aa407d8ce14e7743559 (diff)
TextSourceElement surrogate pair support (#2217)
* Update StringUtil * Refactor * Handle UTF-16 surrogate pairs
Diffstat (limited to 'ext/js/data/sandbox')
-rw-r--r--ext/js/data/sandbox/string-util.js15
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/js/data/sandbox/string-util.js b/ext/js/data/sandbox/string-util.js
index 65d73eef..72b8fc7f 100644
--- a/ext/js/data/sandbox/string-util.js
+++ b/ext/js/data/sandbox/string-util.js
@@ -27,16 +27,19 @@ class StringUtil {
* @returns {string} The code points from the string.
*/
static readCodePointsForward(text, position, count) {
+ const textLength = text.length;
let result = '';
for (; count > 0; --count) {
const char = text[position];
- const charCode = char.charCodeAt(0);
result += char;
- if (charCode >= 0xd800 && charCode < 0xdc00 && ++position < text.length) {
+ if (++position >= textLength) { break; }
+ const charCode = char.charCodeAt(0);
+ if (charCode >= 0xd800 && charCode < 0xdc00) {
const char2 = text[position];
const charCode2 = char2.charCodeAt(0);
if (charCode2 >= 0xdc00 && charCode2 < 0xe000) {
result += char2;
+ if (++position >= textLength) { break; }
}
}
}
@@ -54,13 +57,15 @@ class StringUtil {
let result = '';
for (; count > 0; --count) {
const char = text[position];
- const charCode = char.charCodeAt(0);
result = char + result;
- if (charCode >= 0xdc00 && charCode < 0xe000 && position > 0) {
- const char2 = text[position - 1];
+ if (--position < 0) { break; }
+ const charCode = char.charCodeAt(0);
+ if (charCode >= 0xdc00 && charCode < 0xe000) {
+ const char2 = text[position];
const charCode2 = char2.charCodeAt(0);
if (charCode2 >= 0xd800 && charCode2 < 0xdc00) {
result = char2 + result;
+ if (--position < 0) { break; }
}
}
}