From 09f3c5c7e928baca7e9775e9e135f4d65dad33a7 Mon Sep 17 00:00:00 2001
From: Alexey Orlenko <eaglexrlnk@gmail.com>
Date: Mon, 22 May 2017 21:45:57 +0300
Subject: [PATCH 1/2] zlib: fix node crashing on invalid options

This is a partial backport of semver-patch bits of
9e4660b5187d4be6a1484e705dc735c0e76ffafa.

This commit fixes the Node process crashing when constructors of classes
of the zlib module are given invalid options.

* Throw an Error when the zlib library rejects the value of windowBits,
  instead of crashing with an assertion.

* Treat windowBits and memLevel options consistently with other ones and
  don't crash when non-numeric values are given.

Refs: https://github.com/nodejs/node/pull/13098
---
 doc/api/zlib.md                        |  4 ++++
 lib/zlib.js                            | 10 ++++++++--
 src/node_zlib.cc                       | 13 ++++++++-----
 test/parallel/test-zlib-failed-init.js | 13 +++++++++++++
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 test/parallel/test-zlib-failed-init.js

diff --git a/doc/api/zlib.md b/doc/api/zlib.md
index d28c411f70f389..7c6b9a32f8ef85 100644
--- a/doc/api/zlib.md
+++ b/doc/api/zlib.md
@@ -436,6 +436,10 @@ added: v0.5.8
 
 Returns a new [DeflateRaw][] object with an [options][].
 
+*Note*: The zlib library rejects requests for 256-byte windows (i.e.,
+`{ windowBits: 8 }` in `options`). An `Error` will be thrown when creating a
+[DeflateRaw][] object with this specific value of the `windowBits` option.
+
 ## zlib.createGunzip([options])
 <!-- YAML
 added: v0.5.8
diff --git a/lib/zlib.js b/lib/zlib.js
index 7742e68ad6eb75..2c08512c471125 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -364,9 +364,15 @@ function Zlib(opts, mode) {
   var strategy = constants.Z_DEFAULT_STRATEGY;
   if (typeof opts.strategy === 'number') strategy = opts.strategy;
 
-  this._handle.init(opts.windowBits || constants.Z_DEFAULT_WINDOWBITS,
+  var windowBits = constants.Z_DEFAULT_WINDOWBITS;
+  if (typeof opts.windowBits === 'number') windowBits = opts.windowBits;
+
+  var memLevel = constants.Z_DEFAULT_MEMLEVEL;
+  if (typeof opts.memLevel === 'number') memLevel = opts.memLevel;
+
+  this._handle.init(windowBits || constants.Z_DEFAULT_WINDOWBITS,
                     level,
-                    opts.memLevel || constants.Z_DEFAULT_MEMLEVEL,
+                    memLevel || constants.Z_DEFAULT_MEMLEVEL,
                     strategy,
                     opts.dictionary);
 
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 0b85e6a1d60921..b387b7e43fd231 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -530,16 +530,19 @@ class ZCtx : public AsyncWrap {
         CHECK(0 && "wtf?");
     }
 
-    if (ctx->err_ != Z_OK) {
-      ZCtx::Error(ctx, "Init error");
-    }
-
-
     ctx->dictionary_ = reinterpret_cast<Bytef *>(dictionary);
     ctx->dictionary_len_ = dictionary_len;
 
     ctx->write_in_progress_ = false;
     ctx->init_done_ = true;
+
+    if (ctx->err_ != Z_OK) {
+      if (dictionary != nullptr) {
+        delete[] dictionary;
+        ctx->dictionary_ = nullptr;
+      }
+      ctx->env()->ThrowError("Init error");
+    }
   }
 
   static void SetDictionary(ZCtx* ctx) {
diff --git a/test/parallel/test-zlib-failed-init.js b/test/parallel/test-zlib-failed-init.js
new file mode 100644
index 00000000000000..afc2c82ddfca8e
--- /dev/null
+++ b/test/parallel/test-zlib-failed-init.js
@@ -0,0 +1,13 @@
+'use strict';
+
+require('../common');
+
+const assert = require('assert');
+const zlib = require('zlib');
+
+// For raw deflate encoding, requests for 256-byte windows are rejected as
+// invalid by zlib.
+// (http://zlib.net/manual.html#Advanced)
+assert.throws(() => {
+  zlib.createDeflateRaw({ windowBits: 8 });
+}, /^Error: Init error$/);

From c26a2c315f3367d4f46b83f7218c6545d703cdd1 Mon Sep 17 00:00:00 2001
From: Alexey Orlenko <eaglexrlnk@gmail.com>
Date: Thu, 25 May 2017 06:32:08 +0300
Subject: [PATCH 2/2] squash! address the nits

---
 lib/zlib.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/zlib.js b/lib/zlib.js
index 2c08512c471125..ec6c7c29ca0621 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -365,14 +365,18 @@ function Zlib(opts, mode) {
   if (typeof opts.strategy === 'number') strategy = opts.strategy;
 
   var windowBits = constants.Z_DEFAULT_WINDOWBITS;
-  if (typeof opts.windowBits === 'number') windowBits = opts.windowBits;
+  if (opts.windowBits && typeof opts.windowBits === 'number') {
+    windowBits = opts.windowBits;
+  }
 
   var memLevel = constants.Z_DEFAULT_MEMLEVEL;
-  if (typeof opts.memLevel === 'number') memLevel = opts.memLevel;
+  if (opts.memLevel && typeof opts.memLevel === 'number') {
+    memLevel = opts.memLevel;
+  }
 
-  this._handle.init(windowBits || constants.Z_DEFAULT_WINDOWBITS,
+  this._handle.init(windowBits,
                     level,
-                    memLevel || constants.Z_DEFAULT_MEMLEVEL,
+                    memLevel,
                     strategy,
                     opts.dictionary);