stream: fix multiple Writable.destroy() calls

Calling Writable.destroy() multiple times in the same tick could cause an assertion error. Fixes: #38189 PR-URL: #38221 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Nitzan Uziely <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Apr 29, 2021 · a540afd · a540afd
1 parent 8d4936d
commit a540afd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/internal/streams/writable.js b/lib/internal/streams/writable.js
@@ -770,7 +770,11 @@ ObjectDefineProperties(Writable.prototype, {
 const destroy = destroyImpl.destroy;
 Writable.prototype.destroy = function(err, cb) {
   const state = this._writableState;
-  if (!state.destroyed) {
+
+  // Invoke pending callbacks.
+  if (!state.destroyed &&
+    (state.bufferedIndex < state.buffered.length ||
+      state[kOnFinished].length)) {
     process.nextTick(errorBuffer, state, new ERR_STREAM_DESTROYED('write'));
   }
   destroy.call(this, err, cb);

diff --git a/test/parallel/test-stream-writable-destroy.js b/test/parallel/test-stream-writable-destroy.js
@@ -417,3 +417,14 @@ const assert = require('assert');
   }));
   write.write('asd');
 }
+
+{
+  // Destroy twice
+  const write = new Writable({
+    write(chunk, enc, cb) { cb(); }
+  });
+
+  write.end(common.mustCall());
+  write.destroy();
+  write.destroy();
+}