summaryrefslogtreecommitdiff
path: root/lib/_stream_readable.js
diff options
context:
space:
mode:
authorRobert Nagy <ronagy@icloud.com>2019-09-08 10:35:34 +0200
committerRich Trott <rtrott@gmail.com>2019-09-22 15:55:15 -0700
commitec390b63a1989d5da0ec7043f7e2e91398212877 (patch)
tree8f133aa5366591c0d692473f0a71a02611a393a7 /lib/_stream_readable.js
parent8709a408d2eb31a996077cf0ea48c5fbba93adae (diff)
downloadandroid-node-v8-ec390b63a1989d5da0ec7043f7e2e91398212877.tar.gz
android-node-v8-ec390b63a1989d5da0ec7043f7e2e91398212877.tar.bz2
android-node-v8-ec390b63a1989d5da0ec7043f7e2e91398212877.zip
stream: do not call _read() after destroy()
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'lib/_stream_readable.js')
-rw-r--r--lib/_stream_readable.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 7502a1ac2c..2dc1323f09 100644
--- 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) {