1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: make ReadStream throw TypeError on NaN

Browse Source 
Make ReadStream (and thus createReadStream) throw a TypeError signalling
towards an invalid argument type when either options.start or
options.end (or obviously, both) are set to NaN.
Also add regression tests for the same.

PR-URL: https://github.com/nodejs/node/pull/19775
Fixes: https://github.com/nodejs/node/issues/19715
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Ujjwal Sharma 2018-04-03 23:04:20 +05:30 committed by Luigi Pinca
parent 496d6023e0
commit 38a692963f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fs.js
View File

@ -2009,12 +2009,12 @@ function ReadStream(path, options) {
this.closed = false; this.closed = false;
if (this.start !== undefined) { if (this.start !== undefined) {
if (typeof this.start !== 'number') { if (typeof this.start !== 'number' || Number.isNaN(this.start)) {
throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start); throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
} }
if (this.end === undefined) { if (this.end === undefined) {
this.end = Infinity; this.end = Infinity;
} else if (typeof this.end !== 'number') { } else if (typeof this.end !== 'number' || Number.isNaN(this.end)) {
throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end); throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
} }
@ -2031,6 +2031,8 @@ function ReadStream(path, options) {
// (That is a semver-major change). // (That is a semver-major change).
if (typeof this.end !== 'number') if (typeof this.end !== 'number')
this.end = Infinity; this.end = Infinity;
else if (Number.isNaN(this.end))
throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
if (typeof this.fd !== 'number') if (typeof this.fd !== 'number')
this.open(); this.open();

8
test/parallel/test-fs-read-stream-throw-type-error.js
View File

@ -3,6 +3,9 @@ const common = require('../common');
const fixtures = require('../common/fixtures'); const fixtures = require('../common/fixtures');
const fs = require('fs'); const fs = require('fs');
// This test ensures that appropriate TypeError is thrown by createReadStream
// when an argument with invalid type is passed
const example = fixtures.path('x.txt'); const example = fixtures.path('x.txt');
// Should not throw. // Should not throw.
fs.createReadStream(example, undefined); fs.createReadStream(example, undefined);
@ -25,3 +28,8 @@ createReadStreamErr(example, 123);
createReadStreamErr(example, 0); createReadStreamErr(example, 0);
createReadStreamErr(example, true); createReadStreamErr(example, true);
createReadStreamErr(example, false); createReadStreamErr(example, false);
// createReadSteam _should_ throw on NaN
createReadStreamErr(example, { start: NaN });
createReadStreamErr(example, { end: NaN });
createReadStreamErr(example, { start: NaN, end: NaN });