GUACAMOLE-1972: Fix writing UTF-8 strings with surrogate pairs

apache · Jul 30, 2024 · cbe3525 · cbe3525
1 parent 6493a23
commit cbe3525
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -889,7 +889,12 @@ Guacamole.Keyboard = function Keyboard(element) {
         for (var i = 0; i < str.length; i++) {
 
             // Determine keysym of current character
-            var codepoint = str.codePointAt ? str.codePointAt(i) : str.charCodeAt(i);
+            var codepoint = str.codePointAt(i);
+
+            // For surrogate pairs, skip the second 16 bits.
+            if (str.charCodeAt(i) != codepoint) {
+                i++;
+            }
             var keysym = keysym_from_charcode(codepoint);
 
             // Press and release key for current character

diff --git a/guacamole-common-js/src/main/webapp/modules/StringWriter.js b/guacamole-common-js/src/main/webapp/modules/StringWriter.js
@@ -161,7 +161,12 @@ Guacamole.StringWriter = function(stream) {
 
         // Fill buffer with UTF-8
         for (var i=0; i<text.length; i++) {
-            var codepoint = text.charCodeAt(i);
+            var codepoint = text.codePointAt(i);
+
+            // For surrogate pairs, skip the second 16 bits.
+            if (text.charCodeAt(i) != codepoint) {
+                i++;
+            }
             __append_utf8(codepoint);
         }
 
@@ -202,4 +207,4 @@ Guacamole.StringWriter = function(stream) {
      */
     this.onack = null;
 
-};
+};
diff --git a/guacamole/src/main/frontend/src/app/textInput/directives/guacTextInput.js b/guacamole/src/main/frontend/src/app/textInput/directives/guacTextInput.js
@@ -228,9 +228,14 @@ angular.module('textInput').directive('guacTextInput', [function guacTextInput()
 
                 // Send each codepoint within the string
                 for (var i=0; i<content.length; i++) {
-                    var codepoint = content.charCodeAt(i);
+                    var codepoint = content.codePointAt(i);
+
+                    // For surrogate pairs, skip the second 16 bits.
+                    if (content.charCodeAt(i) != codepoint) {
+                        i++;
+                    }
                     if (codepoint !== TEXT_INPUT_PADDING_CODEPOINT) {
-                        sentText += String.fromCharCode(codepoint);
+                        sentText += String.fromCodePoint(codepoint);
                         sendCodepoint(codepoint);
                     }
                 }