Skip to content

Commit

Permalink
fs: move type checking for fs.sync to js
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jasnell committed Dec 13, 2017
1 parent 956f97b commit 8cb080c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 8 deletions.
4 changes: 2 additions & 2 deletions lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ fs.fdatasyncSync = function(fd) {
};

fs.fsync = function(fd, callback) {
if (typeof fd !== 'number')
if (!Number.isInteger(fd))
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
if (fd < 0 || fd > 0xFFFFFFFF)
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
Expand All @@ -935,7 +935,7 @@ fs.fsync = function(fd, callback) {
};

fs.fsyncSync = function(fd) {
if (typeof fd !== 'number')
if (!Number.isInteger(fd))
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'fd', 'number');
if (fd < 0 || fd > 0xFFFFFFFF)
throw new errors.RangeError('ERR_OUT_OF_RANGE', 'fd');
Expand Down
5 changes: 1 addition & 4 deletions src/node_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -806,10 +806,7 @@ static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
static void Fsync(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);

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

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

Expand Down
20 changes: 18 additions & 2 deletions test/parallel/test-fs-fsync.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,35 @@ fs.open(fileFixture, 'a', 0o777, common.mustCall(function(err, fd) {
message: 'The "fd" argument must be of type number'
}
);
common.expectsError(
() => fs.fsync(i),
{
code: 'ERR_INVALID_ARG_TYPE',
type: TypeError,
message: 'The "fd" argument must be of type number'
}
);
common.expectsError(
() => fs.fsyncSync(i),
{
code: 'ERR_INVALID_ARG_TYPE',
type: TypeError,
message: 'The "fd" argument must be of type number'
}
);
});

[-1, 0xFFFFFFFF + 1].forEach((i) => {
common.expectsError(
() => fs.fdatasync(i),
() => fs.fsync(i),
{
code: 'ERR_OUT_OF_RANGE',
type: RangeError,
message: 'The "fd" argument is out of range'
}
);
common.expectsError(
() => fs.fdatasyncSync(i),
() => fs.fsyncSync(i),
{
code: 'ERR_OUT_OF_RANGE',
type: RangeError,
Expand Down

0 comments on commit 8cb080c

Please sign in to comment.