http2: callback valid check before closing request
Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError PR-URL: https://github.com/nodejs/node/pull/19061 Fixes: https://github.com/nodejs/node/issues/18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
This commit is contained in:
parent
cb94bf01aa
commit
caaf7e3a9f
@ -1769,6 +1769,8 @@ class Http2Stream extends Duplex {
|
|||||||
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'code', 'number');
|
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'code', 'number');
|
||||||
if (code < 0 || code > kMaxInt)
|
if (code < 0 || code > kMaxInt)
|
||||||
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'code');
|
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'code');
|
||||||
|
if (callback !== undefined && typeof callback !== 'function')
|
||||||
|
throw new errors.TypeError('ERR_INVALID_CALLBACK');
|
||||||
|
|
||||||
// Clear timeout and remove timeout listeners
|
// Clear timeout and remove timeout listeners
|
||||||
this.setTimeout(0);
|
this.setTimeout(0);
|
||||||
@ -1786,8 +1788,6 @@ class Http2Stream extends Duplex {
|
|||||||
state.rstCode = code;
|
state.rstCode = code;
|
||||||
|
|
||||||
if (callback !== undefined) {
|
if (callback !== undefined) {
|
||||||
if (typeof callback !== 'function')
|
|
||||||
throw new errors.TypeError('ERR_INVALID_CALLBACK');
|
|
||||||
this.once('close', callback);
|
this.once('close', callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,6 +28,18 @@ server.listen(0, common.mustCall(() => {
|
|||||||
);
|
);
|
||||||
assert.strictEqual(req.closed, false);
|
assert.strictEqual(req.closed, false);
|
||||||
|
|
||||||
|
[true, 1, {}, [], null, 'test'].forEach((notFunction) => {
|
||||||
|
common.expectsError(
|
||||||
|
() => req.close(closeCode, notFunction),
|
||||||
|
{
|
||||||
|
type: TypeError,
|
||||||
|
code: 'ERR_INVALID_CALLBACK',
|
||||||
|
message: 'Callback must be a function'
|
||||||
|
}
|
||||||
|
);
|
||||||
|
assert.strictEqual(req.closed, false);
|
||||||
|
});
|
||||||
|
|
||||||
req.close(closeCode, common.mustCall());
|
req.close(closeCode, common.mustCall());
|
||||||
assert.strictEqual(req.closed, true);
|
assert.strictEqual(req.closed, true);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user