jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build in the behavior to ignore decodeUTF8 errors 

Makes the code clearer and more explicit in intent.
This commit is contained in:
Samuel Mannehed 2019-12-23 10:25:02 +01:00
parent 06a8f7d91a
commit 2cf82a5c8e
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/rfb.js
View File

@ -1180,11 +1180,7 @@ export default class RFB extends EventTargetMixin {
const name_length = this._sock.rQshift32(); const name_length = this._sock.rQshift32();
if (this._sock.rQwait('server init name', name_length, 24)) { return false; } if (this._sock.rQwait('server init name', name_length, 24)) { return false; }
let name = this._sock.rQshiftStr(name_length); let name = this._sock.rQshiftStr(name_length);
try { name = decodeUTF8(name, true);
name = decodeUTF8(name);
} catch (e) {
// bypass no-empty
}
if (this._rfb_tightvnc) { if (this._rfb_tightvnc) {
if (this._sock.rQwait('TightVNC extended server init header', 8, 24 + name_length)) { return false; } if (this._sock.rQwait('TightVNC extended server init header', 8, 24 + name_length)) { return false; }
@ -1721,11 +1717,7 @@ export default class RFB extends EventTargetMixin {
} }
let name = this._sock.rQshiftStr(length); let name = this._sock.rQshiftStr(length);
try { name = decodeUTF8(name, true);
name = decodeUTF8(name);
} catch (e) {
// bypass no-empty
}
this._setDesktopName(name); this._setDesktopName(name);

15
core/util/strings.js
View File

@ -7,8 +7,19 @@
*/ */
// Decode from UTF-8 // Decode from UTF-8
export function decodeUTF8(utf8string) { export function decodeUTF8(utf8string, allowLatin1=false) {
return decodeURIComponent(escape(utf8string)); try {
return decodeURIComponent(escape(utf8string));
} catch (e) {
if (e instanceof URIError) {
if (allowLatin1) {
// If we allow Latin1 we can ignore any decoding fails
// and in these cases return the original string
return utf8string;
}
}
throw e;
}
} }
// Encode to UTF-8 // Encode to UTF-8