Handle errors from zlib/pako

[mirror_novnc.git] / core / inflator.js

diff --git a/core/inflator.js b/core/inflator.js
index 68fd8298f0e6a4404dec6a4e5f4a7bb20d931153..39db447a10250c9e8d3edbd9a20279a0e1f77bda 100644 (file)
--- a/core/inflator.js
+++ b/core/inflator.js
@@ -1,8 +1,25 @@
+/*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2020 The noVNC Authors
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ */
+
 import { inflateInit, inflate, inflateReset } from "../vendor/pako/lib/zlib/inflate.js";
 import ZStream from "../vendor/pako/lib/zlib/zstream.js";
 
-Inflate.prototype = {
-    inflate: function (data, flush, expected) {
+export default class Inflate {
+    constructor() {
+        this.strm = new ZStream();
+        this.chunkSize = 1024 * 10 * 10;
+        this.strm.output = new Uint8Array(this.chunkSize);
+        this.windowBits = 5;
+
+        inflateInit(this.strm, this.windowBits);
+    }
+
+    inflate(data, expected) {
         this.strm.input = data;
         this.strm.avail_in = this.strm.input.length;
         this.strm.next_in = 0;
@@ -18,22 +35,19 @@ Inflate.prototype = {
 
         this.strm.avail_out = this.chunkSize;
 
-        inflate(this.strm, flush);
+        let ret = inflate(this.strm, 0); // Flush argument not used.
+        if (ret < 0) {
+            throw new Error("zlib inflate failed");
+        }
+
+        if (this.strm.next_out != expected) {
+            throw new Error("Incomplete zlib block");
+        }
 
         return new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out);
-    },
+    }
 
-    reset: function () {
+    reset() {
         inflateReset(this.strm);
     }
-};
-
-export default function Inflate() {
-    this.strm = new ZStream();
-    this.chunkSize = 1024 * 10 * 10;
-    this.strm.output = new Uint8Array(this.chunkSize);
-    this.windowBits = 5;
-
-    inflateInit(this.strm, this.windowBits);
-};
-
+}