GitHub/noVNC
1
0
Fork 0
mirror of https://github.com/novnc/noVNC.git synced 2026-05-29 16:39:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add try catch in every place that uses decodeUTF8

Browse Source
This commit is contained in:
VanyM
2019-12-05 22:36:51 +03:00
parent 1c9826140a
commit ff1b10ca66
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/rfb.js
View File

@@ -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);