stream: do not emit drain if stream ended

PR-URL: #29086 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
nodejs · Sep 3, 2019 · b36a6e9 · b36a6e9
1 parent 293c9f0
commit b36a6e9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -480,15 +480,17 @@ function onwrite(stream, er) {
     }
 
     if (sync) {
-      process.nextTick(afterWrite, stream, state, finished, cb);
+      process.nextTick(afterWrite, stream, state, cb);
     } else {
-      afterWrite(stream, state, finished, cb);
+      afterWrite(stream, state, cb);
     }
   }
 }
 
-function afterWrite(stream, state, finished, cb) {
-  if (!finished && state.length === 0 && state.needDrain) {
+function afterWrite(stream, state, cb) {
+  const needDrain = !state.ending && !stream.destroyed && state.length === 0 &&
+    state.needDrain;
+  if (needDrain) {
     state.needDrain = false;
     stream.emit('drain');
   }

diff --git a/test/parallel/test-stream-write-drain.js b/test/parallel/test-stream-write-drain.js
@@ -0,0 +1,16 @@
+'use strict';
+const common = require('../common');
+const { Writable } = require('stream');
+
+// Don't emit 'drain' if ended
+
+const w = new Writable({
+  write(data, enc, cb) {
+    process.nextTick(cb);
+  },
+  highWaterMark: 1
+});
+
+w.on('drain', common.mustNotCall());
+w.write('asd');
+w.end();