nodejs
diff --git a/‎src/node_zlib.cc‎
Lines changed: 7 additions & 2 deletions b/‎src/node_zlib.cc‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎test/parallel/test-zlib.js‎
Lines changed: 7 additions & 0 deletions b/‎test/parallel/test-zlib.js‎
Lines changed: 7 additions & 0 deletions
@@ -111,7 +111,12 @@ enum node_zlib_mode {
 
 struct CompressionError {
   CompressionError(const char* message, const char* code, int err)
-    : message(message), code(code), err(err) {}
+      : message(message),
+        code(code),
+        err(err) {
+    CHECK_NOT_NULL(message);
+  }
+
   CompressionError() = default;
 
   const char* message = nullptr;
@@ -997,7 +1002,7 @@ CompressionError ZlibContext::Init(
   if (err_ != Z_OK) {
     dictionary_.clear();
     mode_ = NONE;
-    return ErrorForMessage(nullptr);
+    return ErrorForMessage("zlib error");
   }
 
   return SetDictionary();
 
@@ -27,6 +27,13 @@ const stream = require('stream');
 const fs = require('fs');
 const fixtures = require('../common/fixtures');
 
+// Should not segfault.
+assert.throws(() => zlib.gzipSync(Buffer.alloc(0), { windowBits: 8 }), {
+  code: 'ERR_ZLIB_INITIALIZATION_FAILED',
+  name: 'Error',
+  message: 'Initialization failed',
+});
+
 let zlibPairs = [
   [zlib.Deflate, zlib.Inflate],
   [zlib.Gzip, zlib.Gunzip],