Skip to content

Commit c0d5001

Browse files
committed
stream: Fix early end in Writables on zero-length writes
Doing this causes problems: z.write(Buffer(0)); z.end(); Fix by not ending Writable streams while they're still in the process of writing something.
1 parent 8632af3 commit c0d5001

File tree

3 files changed

+72
-1
lines changed

3 files changed

+72
-1
lines changed

lib/_stream_writable.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,10 @@ Writable.prototype.end = function(chunk, encoding, cb) {
327327
};
328328

329329
function finishMaybe(stream, state) {
330-
if (state.ending && state.length === 0 && !state.finished) {
330+
if (state.ending &&
331+
state.length === 0 &&
332+
!state.finished &&
333+
!state.writing) {
331334
state.finished = true;
332335
stream.emit('finish');
333336
}

test/simple/test-stream2-writable.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,3 +326,23 @@ test('end(chunk) two times is an error', function(t) {
326326
t.end();
327327
});
328328
});
329+
330+
test('dont end while writing', function(t) {
331+
var w = new W();
332+
var wrote = false;
333+
w._write = function(chunk, e, cb) {
334+
assert(!this.writing);
335+
wrote = true;
336+
this.writing = true;
337+
setTimeout(function() {
338+
this.writing = false;
339+
cb();
340+
});
341+
};
342+
w.on('finish', function() {
343+
assert(wrote);
344+
t.end();
345+
});
346+
w.write(Buffer(0));
347+
w.end();
348+
});

test/simple/test-zlib-zero-byte.js

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
25+
var zlib = require('zlib');
26+
var gz = zlib.Gzip()
27+
var emptyBuffer = new Buffer(0);
28+
var received = 0;
29+
gz.on('data', function(c) {
30+
received += c.length;
31+
});
32+
var ended = false;
33+
gz.on('end', function() {
34+
ended = true;
35+
});
36+
var finished = false;
37+
gz.on('finish', function() {
38+
finished = true;
39+
});
40+
gz.write(emptyBuffer);
41+
gz.end();
42+
43+
process.on('exit', function() {
44+
assert.equal(received, 20);
45+
assert(ended);
46+
assert(finished);
47+
console.log('ok');
48+
});

0 commit comments

Comments
 (0)