stream: do not call _read() after destroy()

ronag · Trott · commit ec390b63a198 · 2019-09-22T15:55:15.000-07:00
PR-URL: #29491 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Minwoo Jung <minwoo@nodesource.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -490,9 +490,10 @@ Readable.prototype.read = function(n) {
     debug('length less than watermark', doRead);
   }
 
-  // However, if we've ended, then there's no point, and if we're already
-  // reading, then it's unnecessary.
-  if (state.ended || state.reading) {
+  // However, if we've ended, then there's no point, if we're already
+  // reading, then it's unnecessary, and if we're destroyed, then it's
+  // not allowed.
+  if (state.ended || state.reading || state.destroyed) {
     doRead = false;
     debug('reading or ended', doRead);
   } else if (doRead) {
diff --git a/lib/internal/fs/streams.js b/lib/internal/fs/streams.js
@@ -137,9 +137,6 @@ ReadStream.prototype._read = function(n) {
     });
   }
 
-  if (this.destroyed)
-    return;
-
   if (!pool || pool.length - pool.used < kMinPoolSpace) {
     // Discard the old pool.
     allocNewPool(this.readableHighWaterMark);
diff --git a/test/parallel/test-stream-readable-destroy.js b/test/parallel/test-stream-readable-destroy.js
@@ -189,3 +189,12 @@ const assert = require('assert');
   read.push('hi');
   read.on('data', common.mustNotCall());
 }
+
+{
+  const read = new Readable({
+    read: common.mustNotCall(function() {})
+  });
+  read.destroy();
+  assert.strictEqual(read.destroyed, true);
+  read.read();
+}
diff --git a/test/parallel/test-wrap-js-stream-exceptions.js b/test/parallel/test-wrap-js-stream-exceptions.js
@@ -10,7 +10,7 @@ process.once('uncaughtException', common.mustCall((err) => {
 }));
 
 const socket = new JSStreamWrap(new Duplex({
-  read: common.mustCall(),
+  read: common.mustNotCall(),
   write: common.mustCall((buffer, data, cb) => {
     throw new Error('exception!');
   })

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,6 @@ ReadStream.prototype._read = function(n) {`
`137`	`137`	`});`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (this.destroyed)`
`141`		`- return;`
`142`		`-`
`143`	`140`	`if (!pool \|\| pool.length - pool.used < kMinPoolSpace) {`
`144`	`141`	`// Discard the old pool.`
`145`	`142`	`allocNewPool(this.readableHighWaterMark);`