From 4cfa05b8244353a9eff3fd2ae764a0dcf768c228 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Tue, 8 Oct 2019 21:48:40 +0200
Subject: [PATCH] stream: don't read after destroy

---
 lib/_stream_readable.js                           | 13 +++++++++----
 test/parallel/test-stream-duplex-destroy.js       |  2 --
 .../test-stream-readable-async-iterators.js       |  3 +--
 test/parallel/test-stream-readable-destroy.js     | 15 ++++++++++++---
 test/parallel/test-stream-transform-destroy.js    |  2 --
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 996a14ddc0dc7d..477c5ca4022040 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -223,6 +223,9 @@ Object.defineProperty(Readable.prototype, 'readableEnded', {
 Readable.prototype.destroy = destroyImpl.destroy;
 Readable.prototype._undestroy = destroyImpl.undestroy;
 Readable.prototype._destroy = function(err, cb) {
+  const state = this._readableState;
+  state.length = 0;
+  state.buffer.clear();
   cb(err);
 };
 
@@ -414,6 +417,10 @@ function howMuchToRead(n, state) {
 
 // You can override either this method, or the async _read(n) below.
 Readable.prototype.read = function(n) {
+  const state = this._readableState;
+  if (state.destroyed) {
+    return null;
+  }
   debug('read', n);
   // Same as parseInt(undefined, 10), however V8 7.3 performance regressed
   // in this scenario, so we are doing it manually.
@@ -422,7 +429,6 @@ Readable.prototype.read = function(n) {
   } else if (!Number.isInteger(n)) {
     n = parseInt(n, 10);
   }
-  const state = this._readableState;
   const nOrig = n;
 
   // If we're asking for more than the current hwm, then raise the hwm.
@@ -491,9 +497,8 @@ Readable.prototype.read = function(n) {
   }
 
   // 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) {
+  // reading, then it's unnecessary.
+  if (state.ended || state.reading) {
     doRead = false;
     debug('reading or ended', doRead);
   } else if (doRead) {
diff --git a/test/parallel/test-stream-duplex-destroy.js b/test/parallel/test-stream-duplex-destroy.js
index 3c38d2c364051c..497aa0b4842da5 100644
--- a/test/parallel/test-stream-duplex-destroy.js
+++ b/test/parallel/test-stream-duplex-destroy.js
@@ -122,9 +122,7 @@ const assert = require('assert');
 
   duplex.destroy();
 
-  duplex.removeListener('end', fail);
   duplex.removeListener('finish', fail);
-  duplex.on('end', common.mustCall());
   duplex.on('finish', common.mustCall());
   assert.strictEqual(duplex.destroyed, true);
 }
diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js
index 4a63e9fd3022e6..93ce251c32cacb 100644
--- a/test/parallel/test-stream-readable-async-iterators.js
+++ b/test/parallel/test-stream-readable-async-iterators.js
@@ -259,7 +259,6 @@ async function tests() {
     let err = null;
     try {
       for await (const k of readable) {
-        assert.strictEqual(k, 'hello');
         received++;
       }
     } catch (e) {
@@ -267,7 +266,7 @@ async function tests() {
     }
 
     assert.strictEqual(err.message, 'kaboom');
-    assert.strictEqual(received, 1);
+    assert.strictEqual(received, 0);
   }
 
   {
diff --git a/test/parallel/test-stream-readable-destroy.js b/test/parallel/test-stream-readable-destroy.js
index 7687ea90cc82d8..1b54de2f251148 100644
--- a/test/parallel/test-stream-readable-destroy.js
+++ b/test/parallel/test-stream-readable-destroy.js
@@ -111,9 +111,6 @@ const assert = require('assert');
   read.on('close', common.mustCall());
 
   read.destroy();
-
-  read.removeListener('end', fail);
-  read.on('end', common.mustCall());
   assert.strictEqual(read.destroyed, true);
 }
 
@@ -198,3 +195,15 @@ const assert = require('assert');
   assert.strictEqual(read.destroyed, true);
   read.read();
 }
+
+{
+  // Don't emit 'data' after destroy
+  const read = new Readable({
+    read() {
+      read.push('asd');
+    }
+  });
+  read.on('data', common.mustCall(() => {
+    read.destroy();
+  }));
+}
diff --git a/test/parallel/test-stream-transform-destroy.js b/test/parallel/test-stream-transform-destroy.js
index c594d9989ae4de..89ba8286a097b9 100644
--- a/test/parallel/test-stream-transform-destroy.js
+++ b/test/parallel/test-stream-transform-destroy.js
@@ -114,9 +114,7 @@ const assert = require('assert');
 
   transform.destroy();
 
-  transform.removeListener('end', fail);
   transform.removeListener('finish', fail);
-  transform.on('end', common.mustCall());
   transform.on('finish', common.mustCall());
 }