Nulo/tar-stream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better destroy logic for pack stream

Browse source
This commit is contained in:
Mathias Buus 2013-12-20 22:57:45 +01:00
parent c39a9a4498
commit 3ee758edd0
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pack.js
View file

@ -15,6 +15,7 @@ var overflow = function(self, size) {
var Sink = function(to) { var Sink = function(to) {
stream.Writable.call(this); stream.Writable.call(this);
this.written = 0;
this._to = to; this._to = to;
this._destroyed = false; this._destroyed = false;
}; };
@ -22,6 +23,7 @@ var Sink = function(to) {
util.inherits(Sink, stream.Writable); util.inherits(Sink, stream.Writable);
Sink.prototype._write = function(data, enc, cb) { Sink.prototype._write = function(data, enc, cb) {
this.written += data.length;
if (this._to.push(data)) return cb(); if (this._to.push(data)) return cb();
this._to._drain = cb; this._to._drain = cb;
}; };
@ -38,7 +40,7 @@ var Pack = function(opts) {
this._drain = noop; this._drain = noop;
this._finalized = false; this._finalized = false;
this._shouldFinalize = false; this._finalizing = false;
this._destroyed = false; this._destroyed = false;
this._stream = null; this._stream = null;
}; };
@ -46,13 +48,15 @@ var Pack = function(opts) {
util.inherits(Pack, stream.Readable); util.inherits(Pack, stream.Readable);
Pack.prototype.entry = function(header, buffer, callback) { Pack.prototype.entry = function(header, buffer, callback) {
if (this._stream) throw new Error('already piping an entry');
if (this._finalized || this._destroyed) return;
if (typeof buffer === 'function') { if (typeof buffer === 'function') {
callback = buffer; callback = buffer;
buffer = null; buffer = null;
} }
if (!callback) callback = noop; if (!callback) callback = noop;
if (this._stream) throw new Error('already piping an entry');
var self = this; var self = this;
@ -80,10 +84,20 @@ Pack.prototype.entry = function(header, buffer, callback) {
eos(sink, function(err) { eos(sink, function(err) {
self._stream = null; self._stream = null;
if (err) { // stream was closed
self.destroy();
return callback(err);
}
if (sink.written !== header.size) { // corrupting tar
self.destroy();
return callback(new Error('size mismatch'));
}
overflow(self, header.size); overflow(self, header.size);
if (self._shouldFinalize) self.finalize(); if (self._finalizing) self.finalize();
if (err) self.destroy(); callback();
callback(err);
}); });
return sink; return sink;
@ -91,7 +105,7 @@ Pack.prototype.entry = function(header, buffer, callback) {
Pack.prototype.finalize = function() { Pack.prototype.finalize = function() {
if (this._stream) { if (this._stream) {
this._shouldFinalize = true; this._finalizing = true;
return; return;
} }