1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zlib: fix decompression of empty data streams

Browse Source 
add4b0ab8cc0ec6 made the assumption that compressed data
would never lead to an empty decompressed stream.

Fix that by explicitly checking the number of read bytes.

PR-URL: https://github.com/nodejs/node/pull/17042
Fixes: https://github.com/nodejs/node/issues/17041
Refs: https://github.com/nodejs/node/pull/13322
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Anna Henningsen 2017-11-15 12:13:43 +01:00
parent c5b8e168b3
commit 01f853cde6
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/zlib.js
View File

@ -95,6 +95,8 @@ function zlibBufferOnEnd() {
var err; var err;
if (this.nread >= kMaxLength) { if (this.nread >= kMaxLength) {
err = new errors.RangeError('ERR_BUFFER_TOO_LARGE'); err = new errors.RangeError('ERR_BUFFER_TOO_LARGE');
} else if (this.nread === 0) {
buf = Buffer.alloc(0);
} else { } else {
var bufs = this.buffers; var bufs = this.buffers;
buf = (bufs.length === 1 ? bufs[0] : Buffer.concat(bufs, this.nread)); buf = (bufs.length === 1 ? bufs[0] : Buffer.concat(bufs, this.nread));
@ -485,6 +487,9 @@ function processChunkSync(self, chunk, flushFlag) {
_close(self); _close(self);
if (nread === 0)
return Buffer.alloc(0);
return (buffers.length === 1 ? buffers[0] : Buffer.concat(buffers, nread)); return (buffers.length === 1 ? buffers[0] : Buffer.concat(buffers, nread));
} }

26
test/parallel/test-zlib-empty-buffer.js Normal file
View File

@ -0,0 +1,26 @@
'use strict';
const common = require('../common');
const zlib = require('zlib');
const { inspect, promisify } = require('util');
const assert = require('assert');
const emptyBuffer = new Buffer(0);
common.crashOnUnhandledRejection();
(async function() {
for (const [ compress, decompress, method ] of [
[ zlib.deflateRawSync, zlib.inflateRawSync, 'raw sync' ],
[ zlib.deflateSync, zlib.inflateSync, 'deflate sync' ],
[ zlib.gzipSync, zlib.gunzipSync, 'gzip sync' ],
[ promisify(zlib.deflateRaw), promisify(zlib.inflateRaw), 'raw' ],
[ promisify(zlib.deflate), promisify(zlib.inflate), 'deflate' ],
[ promisify(zlib.gzip), promisify(zlib.gunzip), 'gzip' ]
]) {
const compressed = await compress(emptyBuffer);
const decompressed = await decompress(compressed);
assert.deepStrictEqual(
emptyBuffer, decompressed,
`Expected ${inspect(compressed)} to match ${inspect(decompressed)} ` +
`to match for ${method}`);
}
})();