Skip to content

src: fix invalid windowBits=8 gzip segfault #33045

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
bnoordhuis wants to merge 5 commits into from
Closed

src: fix invalid windowBits=8 gzip segfault #33045

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9436534
src: fix invalid windowBits=8 gzip segfault
bnoordhuis Apr 24, 2020
1cec86e
zlib: reject windowBits=8 when mode=GZIP
bnoordhuis Apr 24, 2020
4de03b1
fixup! zlib: reject windowBits=8 when mode=GZIP
addaleax May 7, 2020
40da66d
fixup! src: fix invalid windowBits=8 gzip segfault
addaleax May 7, 2020
61b08c3
fixup! zlib: reject windowBits=8 when mode=GZIP
addaleax May 8, 2020
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
Next Next commit
zlib: reject windowBits=8 when mode=GZIP 
It's also handled in C++ land now, per the previous commit, but
intercepting it in JS land makes for prettier error messages.
  • Loading branch information
@bnoordhuis
bnoordhuis committed Apr 24, 2020
commit 1cec86e9622c8cc5e27e986981a5b2dd51b65a2e
4 changes: 3 additions & 1 deletion lib/zlib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,11 @@ function Zlib(opts, mode) {
mode === UNZIP)) {
windowBits = 0;
} else {
// `{ windowBits: 8 }` is valid for deflate but nog gzip.
Comment thread
addaleax marked this conversation as resolved.
Outdated
const min = Z_MIN_WINDOWBITS + (mode === GZIP);
Comment thread
addaleax marked this conversation as resolved.
Outdated
windowBits = checkRangesOrGetDefault(
opts.windowBits, 'options.windowBits',
Z_MIN_WINDOWBITS, Z_MAX_WINDOWBITS, Z_DEFAULT_WINDOWBITS);
min, Z_MAX_WINDOWBITS, Z_DEFAULT_WINDOWBITS);
}

level = checkRangesOrGetDefault(
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-zlib-failed-init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ assert.throws(
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "options.windowBits" is out of range. It must ' +
'be >= 8 and <= 15. Received 0'
'be >= 9 and <= 15. Received 0'
}
);

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-zlib-zero-windowBits.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ const zlib = require('zlib');
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "options.windowBits" is out of range. ' +
'It must be >= 8 and <= 15. Received 0'
'It must be >= 9 and <= 15. Received 0'
});
}
7 changes: 4 additions & 3 deletions test/parallel/test-zlib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ 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',
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "options.windowBits" is out of range. ' +
'It must be >= 9 and <= 15. Received 8',
});

let zlibPairs = [
Expand Down