Skip to content

fs: move type checking for multiple fs methods to js #17334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasnell wants to merge 10 commits into from
Closed

fs: move type checking for multiple fs methods to js #17334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c5b87f1
fs: move type checking for fs.close to js
jasnell Nov 26, 2017
7fe6d11
fs: move type checking on fs.fstat to js
jasnell Nov 26, 2017
19de315
fs: move type checking for fs.fdatasync to js
jasnell Nov 26, 2017
d308dec
fs: move type checking for fs.sync to js
jasnell Nov 26, 2017
ca84f5c
fs: move type checking for fs.ftruncate to js
jasnell Nov 26, 2017
8b03b46
fs: move type checking for fs.fchmod to js
jasnell Nov 26, 2017
37e9cb5
fs: move type checking for fs.fchown to js
jasnell Nov 27, 2017
867d275
fs: move type checking in fs.futimes to js
jasnell Nov 27, 2017
458ab44
fs: move type checking for fs.read to js
jasnell Nov 27, 2017
4f74917
fs: remove unnecessary throw on fs.mkdtemp
jasnell Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fs: move type checking for fs.ftruncate to js
  • Loading branch information
@jasnell
jasnell committed Nov 26, 2017
commit ca84f5c964a9884a352261e66c9c6700265dc1a8
8 changes: 4 additions & 4 deletions lib/fs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,11 +864,11 @@ fs.ftruncate = function(fd, len, callback) {
} else if (len === undefined) {
len = 0;
}
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');
if (typeof len !== 'number')
if (!Number.isInteger(len))
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'len', 'number');
len = Math.max(0, len);
const req = new FSReqWrap();
Expand All @@ -880,11 +880,11 @@ fs.ftruncateSync = function(fd, len) {
if (len === undefined) {
len = 0;
}
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');
if (typeof len !== 'number')
if (!Number.isInteger(len))
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'len', 'number');
len = Math.max(0, len);
return binding.ftruncate(fd, len);
Expand Down
19 changes: 3 additions & 16 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,24 +763,11 @@ static void Rename(const FunctionCallbackInfo<Value>& args) {
static void FTruncate(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);

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

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

// FIXME(bnoordhuis) It's questionable to reject non-ints here but still
// allow implicit coercion from null or undefined to zero. Probably best
// handled in lib/fs.js.
Local<Value> len_v(args[1]);
if (!len_v->IsUndefined() &&
!len_v->IsNull() &&
!IsInt64(len_v->NumberValue())) {
return env->ThrowTypeError("Not an integer");
}

const int64_t len = len_v->IntegerValue();
const int64_t len = args[1]->IntegerValue();
Copy link
Copy Markdown
Member

@addaleax addaleax Nov 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something something deprecated overload ;)


if (args[2]->IsObject()) {
ASYNC_CALL(ftruncate, args[2], UTF8, fd, len)
Expand Down
61 changes: 61 additions & 0 deletions test/parallel/test-fs-truncate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,69 @@ function testFtruncate(cb) {
fs.writeFileSync(file5, 'Hi');
const fd = fs.openSync(file5, 'r+');
process.on('exit', () => fs.closeSync(fd));

['', false, null, {}, []].forEach((i) => {
common.expectsError(
() => fs.ftruncate(fd, i),
{
code: 'ERR_INVALID_ARG_TYPE',
type: TypeError,
message: 'The "len" argument must be of type number'
}
);
});

fs.ftruncate(fd, undefined, common.mustCall(function(err) {
assert.ifError(err);
assert(fs.readFileSync(file5).equals(Buffer.from('')));
}));
}

{
const file6 = path.resolve(tmp, 'truncate-file-6.txt');
fs.writeFileSync(file6, 'Hi');
const fd = fs.openSync(file6, 'r+');
process.on('exit', () => fs.closeSync(fd));
fs.ftruncate(fd, -1, common.mustCall(function(err) {
assert.ifError(err);
assert(fs.readFileSync(file6).equals(Buffer.from('')));
}));
}

['', false, null, undefined, {}, []].forEach((i) => {
common.expectsError(
() => fs.ftruncate(i),
{
code: 'ERR_INVALID_ARG_TYPE',
type: TypeError,
message: 'The "fd" argument must be of type number'
}
);
common.expectsError(
() => fs.ftruncateSync(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.ftruncate(i),
{
code: 'ERR_OUT_OF_RANGE',
type: RangeError,
message: 'The "fd" argument is out of range'
}
);
common.expectsError(
() => fs.ftruncateSync(i),
{
code: 'ERR_OUT_OF_RANGE',
type: RangeError,
message: 'The "fd" argument is out of range'
}
);
});