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

Enforce Tight PNG restrictions 

Tight PNG rects cannot use the basic compression variants, and PNG
cannot be used in a standard Tight rect.

This is a partial revert of 3e8b26a based on better understanding
of the encoding.
This commit is contained in:
Pierre Ossman 2018-02-27 10:50:13 +01:00
parent 2c813a33fe
commit 5bdcf5d31c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/rfb.js
View File

@ -169,8 +169,8 @@ export default function RFB(target, url, options) {
this._encHandlers[encodings.encodingCopyRect] = RFB.encodingHandlers.COPYRECT.bind(this); this._encHandlers[encodings.encodingCopyRect] = RFB.encodingHandlers.COPYRECT.bind(this);
this._encHandlers[encodings.encodingRRE] = RFB.encodingHandlers.RRE.bind(this); this._encHandlers[encodings.encodingRRE] = RFB.encodingHandlers.RRE.bind(this);
this._encHandlers[encodings.encodingHextile] = RFB.encodingHandlers.HEXTILE.bind(this); this._encHandlers[encodings.encodingHextile] = RFB.encodingHandlers.HEXTILE.bind(this);
this._encHandlers[encodings.encodingTight] = RFB.encodingHandlers.TIGHT.bind(this); this._encHandlers[encodings.encodingTight] = RFB.encodingHandlers.TIGHT.bind(this, false);
this._encHandlers[encodings.encodingTightPNG] = RFB.encodingHandlers.TIGHT.bind(this); this._encHandlers[encodings.encodingTightPNG] = RFB.encodingHandlers.TIGHT.bind(this, true);
this._encHandlers[encodings.pseudoEncodingDesktopSize] = RFB.encodingHandlers.DesktopSize.bind(this); this._encHandlers[encodings.pseudoEncodingDesktopSize] = RFB.encodingHandlers.DesktopSize.bind(this);
this._encHandlers[encodings.pseudoEncodingLastRect] = RFB.encodingHandlers.last_rect.bind(this); this._encHandlers[encodings.pseudoEncodingLastRect] = RFB.encodingHandlers.last_rect.bind(this);
@ -2111,7 +2111,7 @@ RFB.encodingHandlers = {
return true; return true;
}, },
TIGHT: function () { TIGHT: function (isTightPNG) {
this._FBU.bytes = 1; // compression-control byte this._FBU.bytes = 1; // compression-control byte
if (this._sock.rQwait("TIGHT compression-control", this._FBU.bytes)) { return false; } if (this._sock.rQwait("TIGHT compression-control", this._FBU.bytes)) { return false; }
@ -2342,6 +2342,13 @@ RFB.encodingHandlers = {
else return this._fail("Illegal tight compression received (ctl: " + else return this._fail("Illegal tight compression received (ctl: " +
ctl + ")"); ctl + ")");
if (isTightPNG && (ctl < 0x08)) {
return this._fail("BasicCompression received in TightPNG rect");
}
if (!isTightPNG && (ctl === 0x0A)) {
return this._fail("PNG received in standard Tight rect");
}
switch (cmode) { switch (cmode) {
// fill use depth because TPIXELs drop the padding byte // fill use depth because TPIXELs drop the padding byte
case "fill": // TPIXEL case "fill": // TPIXEL