stream: sync stream unpipe resume

ronag · MylesBorins · commit 256289fe833d · 2020-01-16T01:34:32.000-05:00
pipe() ondata should not control flow state if cleaned up. Fixes: #31190 PR-URL: #31191 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -740,6 +740,7 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
           debug('false write response, pause', state.awaitDrainWriters.size);
           state.awaitDrainWriters.add(dest);
         }
+        src.pause();
       }
       if (!ondrain) {
         // When the dest drains, it reduces the awaitDrain counter
@@ -749,7 +750,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
         ondrain = pipeOnDrain(src, dest);
         dest.on('drain', ondrain);
       }
-      src.pause();
     }
   }
 
diff --git a/test/parallel/test-stream-readable-unpipe-resume.js b/test/parallel/test-stream-readable-unpipe-resume.js
@@ -0,0 +1,20 @@
+'use strict';
+
+const common = require('../common');
+const stream = require('stream');
+const fs = require('fs');
+
+const readStream = fs.createReadStream(process.execPath);
+
+const transformStream = new stream.Transform({
+  transform: common.mustCall(() => {
+    readStream.unpipe();
+    readStream.resume();
+  })
+});
+
+readStream.on('end', common.mustCall());
+
+readStream
+  .pipe(transformStream)
+  .resume();

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,7 @@ Readable.prototype.pipe = function(dest, pipeOpts) {`
`740`	`740`	`debug('false write response, pause', state.awaitDrainWriters.size);`
`741`	`741`	`state.awaitDrainWriters.add(dest);`
`742`	`742`	`}`
	`743`	`+ src.pause();`
`743`	`744`	`}`
`744`	`745`	`if (!ondrain) {`
`745`	`746`	`// When the dest drains, it reduces the awaitDrain counter`
`@@ -749,7 +750,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) {`
`749`	`750`	`ondrain = pipeOnDrain(src, dest);`
`750`	`751`	`dest.on('drain', ondrain);`
`751`	`752`	`}`
`752`		`- src.pause();`
`753`	`753`	`}`
`754`	`754`	`}`
`755`	`755`