From a5dec3a4707c8523529fc8446328ec8cf0011fd1 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Sat, 10 Jul 2021 21:28:47 +0200 Subject: [PATCH] stream: validate abort signal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/39346 Reviewed-By: James M Snell Reviewed-By: Michaël Zasso Reviewed-By: Matteo Collina --- lib/internal/streams/readable.js | 5 +++-- lib/internal/streams/writable.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js index 7950706a1bf..f25413fa9d6 100644 --- a/lib/internal/streams/readable.js +++ b/lib/internal/streams/readable.js @@ -43,7 +43,7 @@ const { Stream, prependListener } = require('internal/streams/legacy'); const { Buffer } = require('buffer'); const { - addAbortSignalNoValidate, + addAbortSignal, } = require('internal/streams/add-abort-signal'); const eos = require('internal/streams/end-of-stream'); @@ -199,8 +199,9 @@ function Readable(options) { if (typeof options.construct === 'function') this._construct = options.construct; + if (options.signal && !isDuplex) - addAbortSignalNoValidate(options.signal, this); + addAbortSignal(options.signal, this); } Stream.call(this, options); diff --git a/lib/internal/streams/writable.js b/lib/internal/streams/writable.js index f41cc183f09..d8a29620536 100644 --- a/lib/internal/streams/writable.js +++ b/lib/internal/streams/writable.js @@ -46,7 +46,7 @@ const { Buffer } = require('buffer'); const destroyImpl = require('internal/streams/destroy'); const { - addAbortSignalNoValidate, + addAbortSignal, } = require('internal/streams/add-abort-signal'); const { @@ -249,8 +249,9 @@ function Writable(options) { if (typeof options.construct === 'function') this._construct = options.construct; + if (options.signal) - addAbortSignalNoValidate(options.signal, this); + addAbortSignal(options.signal, this); } Stream.call(this, options);