Skip to content
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

Jump to bottom

fs : update validateOffsetLengthRead in utils.js #32896

Closed
wants to merge 3 commits into from
Closed

fs : update validateOffsetLengthRead in utils.js #32896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57f8936
fs : update validateOffsetLengthRead in utils.js
daemon1024 Apr 17, 2020
89d4771
test: modify test for fs validateOffsetLengthRead
daemon1024 Apr 17, 2020
a39cbb6
test: addtional test for validateOffsetLengthRead
daemon1024 Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/internal/fs/utils.js
View file
Open in desktop
Expand Up @@ -539,13 +539,15 @@ function toUnixTimestamp(time, name = 'time') {

const validateOffsetLengthRead = hideStackFrames(
(offset, length, bufferLength) => {
if (offset < 0 || offset >= bufferLength) {
throw new ERR_OUT_OF_RANGE('offset',
`>= 0 && <= ${bufferLength}`, offset);
if (offset < 0) {
throw new ERR_OUT_OF_RANGE('offset', '>= 0', offset);
}
if (length < 0 || offset + length > bufferLength) {
if (length < 0) {
throw new ERR_OUT_OF_RANGE('length', '>= 0', length);
}
if (offset + length > bufferLength) {
throw new ERR_OUT_OF_RANGE('length',
`>= 0 && <= ${bufferLength - offset}`, length);
`<= ${bufferLength - offset}`, length);
}
}
);
Expand Down
21 changes: 17 additions & 4 deletions test/parallel/test-fs-read-type.js
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ assert.throws(() => {
}, {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "offset" is out of range. It must be >= 0 && <= 4. ' +
message: 'The value of "offset" is out of range. It must be >= 0. ' +
'Received -1'
});

Expand Down Expand Up @@ -73,7 +73,7 @@ assert.throws(() => {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "length" is out of range. ' +
'It must be >= 0 && <= 4. Received -1'
'It must be >= 0. Received -1'
});


Expand Down Expand Up @@ -110,7 +110,7 @@ assert.throws(() => {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "offset" is out of range. ' +
'It must be >= 0 && <= 4. Received -1'
'It must be >= 0. Received -1'
});

assert.throws(() => {
Expand All @@ -136,5 +136,18 @@ assert.throws(() => {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "length" is out of range. ' +
'It must be >= 0 && <= 4. Received -1'
'It must be >= 0. Received -1'
});

assert.throws(() => {
fs.readSync(fd,
Buffer.allocUnsafe(expected.length),
0,
expected.length + 1,
0);
}, {
code: 'ERR_OUT_OF_RANGE',
name: 'RangeError',
message: 'The value of "length" is out of range. ' +
'It must be <= 4. Received 5'
});