Skip to content

Commit 8974df1

Browse files
jasnelljasnell
committed
fs: move type checking for fs.close to js
PR-URL: #17334 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 04ae486 commit 8974df1

File tree

3 files changed

+118
-12
lines changed

3 files changed

+118
-12
lines changed

‎lib/fs.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,22 @@ fs.readFileSync = function(path, options) {
636636
};
637637

638638
fs.close = function(fd, callback) {
639-
var req = new FSReqWrap();
639+
if (!Number.isInteger(fd))
640+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
641+
if (fd < 0 || fd > 0xFFFFFFFF)
642+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
643+
644+
const req = new FSReqWrap();
640645
req.oncomplete = makeCallback(callback);
641646
binding.close(fd, req);
642647
};
643648

644649
fs.closeSync = function(fd) {
650+
if (!Number.isInteger(fd))
651+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
652+
if (fd < 0 || fd > 0xFFFFFFFF)
653+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
654+
645655
return binding.close(fd);
646656
};
647657

@@ -854,7 +864,14 @@ fs.ftruncate = function(fd, len, callback) {
854864
} else if (len === undefined) {
855865
len = 0;
856866
}
857-
var req = new FSReqWrap();
867+
if (typeof fd !== 'number')
868+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
869+
if (fd < 0 || fd > 0xFFFFFFFF)
870+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
871+
if (typeof len !== 'number')
872+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'len', 'number');
873+
len = Math.max(0, len);
874+
const req = new FSReqWrap();
858875
req.oncomplete = makeCallback(callback);
859876
binding.ftruncate(fd, len, req);
860877
};
@@ -863,6 +880,13 @@ fs.ftruncateSync = function(fd, len) {
863880
if (len === undefined) {
864881
len = 0;
865882
}
883+
if (typeof fd !== 'number')
884+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
885+
if (fd < 0 || fd > 0xFFFFFFFF)
886+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
887+
if (typeof len !== 'number')
888+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'len', 'number');
889+
len = Math.max(0, len);
866890
return binding.ftruncate(fd, len);
867891
};
868892

@@ -883,22 +907,38 @@ fs.rmdirSync = function(path) {
883907
};
884908

885909
fs.fdatasync = function(fd, callback) {
886-
var req = new FSReqWrap();
910+
if (typeof fd !== 'number')
911+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
912+
if (fd < 0 || fd > 0xFFFFFFFF)
913+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
914+
const req = new FSReqWrap();
887915
req.oncomplete = makeCallback(callback);
888916
binding.fdatasync(fd, req);
889917
};
890918

891919
fs.fdatasyncSync = function(fd) {
920+
if (typeof fd !== 'number')
921+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
922+
if (fd < 0 || fd > 0xFFFFFFFF)
923+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
892924
return binding.fdatasync(fd);
893925
};
894926

895927
fs.fsync = function(fd, callback) {
896-
var req = new FSReqWrap();
928+
if (typeof fd !== 'number')
929+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
930+
if (fd < 0 || fd > 0xFFFFFFFF)
931+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
932+
const req = new FSReqWrap();
897933
req.oncomplete = makeCallback(callback);
898934
binding.fsync(fd, req);
899935
};
900936

901937
fs.fsyncSync = function(fd) {
938+
if (typeof fd !== 'number')
939+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
940+
if (fd < 0 || fd > 0xFFFFFFFF)
941+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
902942
return binding.fsync(fd);
903943
};
904944

@@ -941,7 +981,11 @@ fs.readdirSync = function(path, options) {
941981
};
942982

943983
fs.fstat = function(fd, callback) {
944-
var req = new FSReqWrap();
984+
if (typeof fd !== 'number')
985+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
986+
if (fd < 0 || fd > 0xFFFFFFFF)
987+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
988+
const req = new FSReqWrap();
945989
req.oncomplete = makeStatsCallback(callback);
946990
binding.fstat(fd, req);
947991
};
@@ -967,6 +1011,10 @@ fs.stat = function(path, callback) {
9671011
};
9681012

9691013
fs.fstatSync = function(fd) {
1014+
if (typeof fd !== 'number')
1015+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
1016+
if (fd < 0 || fd > 0xFFFFFFFF)
1017+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
9701018
binding.fstat(fd);
9711019
return statsFromValues();
9721020
};
@@ -1098,13 +1146,32 @@ fs.unlinkSync = function(path) {
10981146
};
10991147

11001148
fs.fchmod = function(fd, mode, callback) {
1101-
var req = new FSReqWrap();
1149+
mode = modeNum(mode);
1150+
if (typeof fd !== 'number')
1151+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
1152+
if (fd < 0 || fd > 0xFFFFFFFF)
1153+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
1154+
if (typeof mode !== 'number')
1155+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'mode', 'number');
1156+
if (mode < 0 || mode > 0o777)
1157+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'mode');
1158+
1159+
const req = new FSReqWrap();
11021160
req.oncomplete = makeCallback(callback);
1103-
binding.fchmod(fd, modeNum(mode), req);
1161+
binding.fchmod(fd, mode, req);
11041162
};
11051163

11061164
fs.fchmodSync = function(fd, mode) {
1107-
return binding.fchmod(fd, modeNum(mode));
1165+
mode = modeNum(mode);
1166+
if (typeof fd !== 'number')
1167+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
1168+
if (fd < 0 || fd > 0xFFFFFFFF)
1169+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
1170+
if (typeof mode !== 'number')
1171+
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'mode', 'number');
1172+
if (mode < 0 || mode > 0o777)
1173+
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'mode');
1174+
return binding.fchmod(fd, mode);
11081175
};
11091176

11101177
if (constants.O_SYMLINK !== undefined) {

‎src/node_file.cc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,7 @@ void Access(const FunctionCallbackInfo<Value>& args) {
464464
void Close(const FunctionCallbackInfo<Value>& args) {
465465
Environment* env = Environment::GetCurrent(args);
466466

467-
if (args.Length() < 1)
468-
return TYPE_ERROR("fd is required");
469-
if (!args[0]->IsInt32())
470-
return TYPE_ERROR("fd must be a file descriptor");
467+
CHECK(args[0]->IsInt32());
471468

472469
int fd = args[0]->Int32Value();
473470

‎test/parallel/test-fs-close-errors.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
const fs = require('fs');
5+
6+
['', false, null, undefined, {}, []].forEach((i) => {
7+
common.expectsError(
8+
() => fs.close(i),
9+
{
10+
code: 'ERR_INVALID_ARG_TYPE',
11+
type: TypeError,
12+
message: 'The "fd" argument must be of type number'
13+
}
14+
);
15+
common.expectsError(
16+
() => fs.closeSync(i),
17+
{
18+
code: 'ERR_INVALID_ARG_TYPE',
19+
type: TypeError,
20+
message: 'The "fd" argument must be of type number'
21+
}
22+
);
23+
});
24+
25+
[-1, 0xFFFFFFFF + 1].forEach((i) => {
26+
common.expectsError(
27+
() => fs.close(i),
28+
{
29+
code: 'ERR_OUT_OF_RANGE',
30+
type: RangeError,
31+
message: 'The "fd" argument is out of range'
32+
}
33+
);
34+
common.expectsError(
35+
() => fs.closeSync(i),
36+
{
37+
code: 'ERR_OUT_OF_RANGE',
38+
type: RangeError,
39+
message: 'The "fd" argument is out of range'
40+
}
41+
);
42+
});

0 commit comments

Comments
 (0)