From: Niko Lehto <nikle@cendio.se>
Date: Mon, 3 Feb 2020 08:57:56 +0000 (+0100)
Subject: Move error handling to Inflate class
X-Git-Tag: v1.2.0~37^2~5
X-Git-Url: https://git.proxmox.com/?p=mirror_novnc.git;a=commitdiff_plain;h=f6669ff7b2e489f0a55d2808ede674e64f777e7d

Move error handling to Inflate class

Every call wants this check so this should be done inside the class.
---

diff --git a/core/decoders/tight.js b/core/decoders/tight.js
index 5a0a315..c226b33 100644
--- a/core/decoders/tight.js
+++ b/core/decoders/tight.js
@@ -161,9 +161,6 @@ export default class TightDecoder {
             }
 
             data = this._zlibs[streamId].inflate(data, uncompressedSize);
-            if (data.length != uncompressedSize) {
-                throw new Error("Incomplete zlib block");
-            }
         }
 
         display.blitRgbImage(x, y, width, height, data, 0, false);
@@ -209,9 +206,6 @@ export default class TightDecoder {
             }
 
             data = this._zlibs[streamId].inflate(data, uncompressedSize);
-            if (data.length != uncompressedSize) {
-                throw new Error("Incomplete zlib block");
-            }
         }
 
         // Convert indexed (palette based) image data to RGB
diff --git a/core/inflator.js b/core/inflator.js
index b7af040..726600f 100644
--- a/core/inflator.js
+++ b/core/inflator.js
@@ -37,6 +37,10 @@ export default class Inflate {
 
         inflate(this.strm, 0); // Flush argument not used.
 
+        if (this.strm.next_out != expected) {
+            throw new Error("Incomplete zlib block");
+        }
+
         return new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out);
     }