diff options
author | Robert Nagy <ronagy@icloud.com> | 2019-07-14 22:11:06 +0200 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2019-08-20 08:47:19 -0700 |
commit | db706da235d80e5dadaab64328bfad9cb313be39 (patch) | |
tree | 58182b1324b6fe3e370bca7a377f99cff73903bf /lib/_stream_writable.js | |
parent | 85898e0aca26cee2e68aea9ba384e23cd4457849 (diff) | |
download | android-node-v8-db706da235d80e5dadaab64328bfad9cb313be39.tar.gz android-node-v8-db706da235d80e5dadaab64328bfad9cb313be39.tar.bz2 android-node-v8-db706da235d80e5dadaab64328bfad9cb313be39.zip |
stream: disallow stream methods on finished stream
Invoke callback with ERR_STREAM_ALREADY_FINISHED error if `end()` is
called on a finished stream.
PR-URL: https://github.com/nodejs/node/pull/28687
Refs: https://github.com/nodejs/node/issues/28667
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'lib/_stream_writable.js')
-rw-r--r-- | lib/_stream_writable.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js index c6d4ec4266..9a01cb1c06 100644 --- a/lib/_stream_writable.js +++ b/lib/_stream_writable.js @@ -41,6 +41,7 @@ const { ERR_MULTIPLE_CALLBACK, ERR_STREAM_CANNOT_PIPE, ERR_STREAM_DESTROYED, + ERR_STREAM_ALREADY_FINISHED, ERR_STREAM_NULL_VALUES, ERR_STREAM_WRITE_AFTER_END, ERR_UNKNOWN_ENCODING @@ -591,6 +592,13 @@ Writable.prototype.end = function(chunk, encoding, cb) { // Ignore unnecessary end() calls. if (!state.ending) endWritable(this, state, cb); + else if (typeof cb === 'function') { + if (!state.finished) { + this.once('finish', cb); + } else { + cb(new ERR_STREAM_ALREADY_FINISHED('end')); + } + } return this; }; |