Skip to content

(v6.x backport) zlib: fix node crashing on invalid options #13201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aqrln wants to merge 2 commits into from
Closed

(v6.x backport) zlib: fix node crashing on invalid options #13201

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9619966
zlib: fix node crashing on invalid options
aqrln May 22, 2017
9fa7d7d
squash! address the nits
aqrln May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
squash! address the nits
  • Loading branch information
@aqrln
aqrln committed May 25, 2017
commit 9fa7d7d9dc6449196f1767682a29017138232ef8
12 changes: 8 additions & 4 deletions lib/zlib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,18 @@ function Zlib(opts, mode) {
if (typeof opts.strategy === 'number') strategy = opts.strategy;

var windowBits = exports.Z_DEFAULT_WINDOWBITS;
if (typeof opts.windowBits === 'number') windowBits = opts.windowBits;
if (opts.windowBits && typeof opts.windowBits === 'number') {
windowBits = opts.windowBits;
}

var memLevel = exports.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 || exports.Z_DEFAULT_WINDOWBITS,
this._handle.init(windowBits,
level,
memLevel || exports.Z_DEFAULT_MEMLEVEL,
memLevel,
strategy,
opts.dictionary);

Expand Down