Browse Source

zlib: do not crash on write after close

fix #7767

Signed-off-by: Fedor Indutny <fedor@indutny.com>
v0.10.30-release
Fedor Indutny 11 years ago
parent
commit
a97bdef06d
  1. 4
      lib/zlib.js
  2. 40
      test/simple/test-zlib-write-after-close.js

4
lib/zlib.js

@ -320,6 +320,7 @@ function Zlib(opts, mode) {
util.inherits(Zlib, Transform);
Zlib.prototype.reset = function reset() {
assert(!this._closed, 'zlib binding closed');
return this._binding.reset();
};
@ -394,6 +395,8 @@ Zlib.prototype._transform = function(chunk, encoding, cb) {
var availOutBefore = this._chunkSize - this._offset;
var inOff = 0;
if (this._closed)
return cb(new Error('zlib binding closed'));
var req = this._binding.write(flushFlag,
chunk, // in
inOff, // in_off
@ -435,6 +438,7 @@ Zlib.prototype._transform = function(chunk, encoding, cb) {
inOff += (availInBefore - availInAfter);
availInBefore = availInAfter;
assert(!self._closed, 'zlib binding closed');
var newReq = self._binding.write(flushFlag,
chunk,
inOff,

40
test/simple/test-zlib-write-after-close.js

@ -0,0 +1,40 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
var common = require('../common.js');
var assert = require('assert');
var zlib = require('zlib');
var closed = false;
zlib.gzip('hello', function(err, out) {
var unzip = zlib.createGunzip();
unzip.close(function() {
closed = true;
});
assert.throws(function() {
unzip.write(out);
});
});
process.on('exit', function() {
assert(closed);
});
Loading…
Cancel
Save