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 16, 2021 · 369f239 · 369f239
1 parent d3162da
commit 369f239
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/internal/streams/writable.js b/lib/internal/streams/writable.js
@@ -57,7 +57,6 @@ const {
   getHighWaterMark,
   getDefaultHighWaterMark
 } = require('internal/streams/state');
-const assert = require('internal/assert');
 const {
   ERR_INVALID_ARG_TYPE,
   ERR_METHOD_NOT_IMPLEMENTED,
@@ -854,11 +853,9 @@ Writable.prototype.destroy = function(err, cb) {
   const state = this._writableState;
 
   // Invoke pending callbacks.
-  if (
-    state.bufferedIndex < state.buffered.length ||
-    state[kOnFinished].length
-  ) {
-    assert(!state.destroyed);
+  if (!state.destroyed &&
+    (state.bufferedIndex < state.buffered.length ||
+      state[kOnFinished].length)) {
     process.nextTick(errorBuffer, state);
   }
 

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