Merge pull request #1327 from vanym/decodeUTF8_try_catch

Fixes exception when desktop name contains non-utf8 character
novnc · Dec 7, 2019 · 84a8c1b · 84a8c1b
2 parents 1c98261 + ff1b10c
commit 84a8c1b
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/core/rfb.js b/core/rfb.js
@@ -1179,7 +1179,12 @@ export default class RFB extends EventTargetMixin {
         /* Connection name/title */
         const name_length = this._sock.rQshift32();
         if (this._sock.rQwait('server init name', name_length, 24)) { return false; }
-        let name = decodeUTF8(this._sock.rQshiftStr(name_length));
+        let name = this._sock.rQshiftStr(name_length);
+        try {
+            name = decodeUTF8(name);
+        } catch (e) {
+            // bypass no-empty
+        }
 
         if (this._rfb_tightvnc) {
             if (this._sock.rQwait('TightVNC extended server init header', 8, 24 + name_length)) { return false; }
@@ -1716,7 +1721,11 @@ export default class RFB extends EventTargetMixin {
         }
 
         let name = this._sock.rQshiftStr(length);
-        name = decodeUTF8(name);
+        try {
+            name = decodeUTF8(name);
+        } catch (e) {
+            // bypass no-empty
+        }
 
         this._setDesktopName(name);