From ceafd1f68f1f1b57c998adf693678059f9aaa70c Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 15 Nov 2022 00:32:59 +0100 Subject: [PATCH] Fix infinite loop when system emoji font is enabled (#1931) Fixes #1930 --- app/javascript/flavours/glitch/features/emoji/emoji.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/features/emoji/emoji.js b/app/javascript/flavours/glitch/features/emoji/emoji.js index 880f9401da..50a3991147 100644 --- a/app/javascript/flavours/glitch/features/emoji/emoji.js +++ b/app/javascript/flavours/glitch/features/emoji/emoji.js @@ -30,11 +30,11 @@ const emojifyTextNode = (node, customEmojis) => { let match, i = 0; if (customEmojis === null) { - while (i < str.length && !(match = trie.search(str.slice(i)))) { + while (i < str.length && (useSystemEmojiFont || !(match = trie.search(str.slice(i))))) { i += str.codePointAt(i) < 65536 ? 1 : 2; } } else { - while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) { + while (i < str.length && str[i] !== ':' && (useSystemEmojiFont || !(match = trie.search(str.slice(i))))) { i += str.codePointAt(i) < 65536 ? 1 : 2; } }