zlib: use RangeError/TypeError consistently

PR-URL: https://github.com/nodejs/node/pull/11391
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>

1 files changed, 16 insertions, 14 deletions

diff --git a/lib/zlib.js b/lib/zlib.js
index 19328d381a..476503b17f 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -31,9 +31,10 @@ for (var ck = 0; ck < ckeys.length; ck++) {
   codes[codes[ckey]] = ckey;
 }
 
-function isValidFlushFlag(flag) {
-  return flag >= constants.Z_NO_FLUSH &&
-         flag <= constants.Z_BLOCK;
+function isInvalidFlushFlag(flag) {
+  return typeof flag !== 'number' ||
+         flag < constants.Z_NO_FLUSH ||
+         flag > constants.Z_BLOCK;
 
   // Covers: constants.Z_NO_FLUSH (0),
   //         constants.Z_PARTIAL_FLUSH (1),
@@ -141,11 +142,11 @@ class Zlib extends Transform {
     this._opts = opts;
     this._chunkSize = opts.chunkSize || constants.Z_DEFAULT_CHUNK;
 
-    if (opts.flush && !isValidFlushFlag(opts.flush)) {
-      throw new Error('Invalid flush flag: ' + opts.flush);
+    if (opts.flush && isInvalidFlushFlag(opts.flush)) {
+      throw new RangeError('Invalid flush flag: ' + opts.flush);
     }
-    if (opts.finishFlush && !isValidFlushFlag(opts.finishFlush)) {
-      throw new Error('Invalid flush flag: ' + opts.finishFlush);
+    if (opts.finishFlush && isInvalidFlushFlag(opts.finishFlush)) {
+      throw new RangeError('Invalid flush flag: ' + opts.finishFlush);
     }
 
     this._flushFlag = opts.flush || constants.Z_NO_FLUSH;
@@ -154,37 +155,38 @@ class Zlib extends Transform {
 
     if (opts.chunkSize) {
       if (opts.chunkSize < constants.Z_MIN_CHUNK) {
-        throw new Error('Invalid chunk size: ' + opts.chunkSize);
+        throw new RangeError('Invalid chunk size: ' + opts.chunkSize);
       }
     }
 
     if (opts.windowBits) {
       if (opts.windowBits < constants.Z_MIN_WINDOWBITS ||
           opts.windowBits > constants.Z_MAX_WINDOWBITS) {
-        throw new Error('Invalid windowBits: ' + opts.windowBits);
+        throw new RangeError('Invalid windowBits: ' + opts.windowBits);
       }
     }
 
     if (opts.level) {
       if (opts.level < constants.Z_MIN_LEVEL ||
           opts.level > constants.Z_MAX_LEVEL) {
-        throw new Error('Invalid compression level: ' + opts.level);
+        throw new RangeError('Invalid compression level: ' + opts.level);
       }
     }
 
     if (opts.memLevel) {
       if (opts.memLevel < constants.Z_MIN_MEMLEVEL ||
           opts.memLevel > constants.Z_MAX_MEMLEVEL) {
-        throw new Error('Invalid memLevel: ' + opts.memLevel);
+        throw new RangeError('Invalid memLevel: ' + opts.memLevel);
       }
     }
 
     if (opts.strategy && isInvalidStrategy(opts.strategy))
-      throw new Error('Invalid strategy: ' + opts.strategy);
+      throw new TypeError('Invalid strategy: ' + opts.strategy);
 
     if (opts.dictionary) {
       if (!(opts.dictionary instanceof Buffer)) {
-        throw new Error('Invalid dictionary: it should be a Buffer instance');
+        throw new TypeError(
+          'Invalid dictionary: it should be a Buffer instance');
       }
     }
 
@@ -280,7 +282,7 @@ class Zlib extends Transform {
     var last = ending && (!chunk || ws.length === chunk.length);
 
     if (chunk !== null && !(chunk instanceof Buffer))
-      return cb(new Error('invalid input'));
+      return cb(new TypeError('invalid input'));
 
     if (!this._handle)
       return cb(new Error('zlib binding closed'));