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

lib: add case of no argument to ERR_INVALID_ARG_VALUE in errors.js #21262

Closed
wants to merge 6 commits into from
Closed

lib: add case of no argument to ERR_INVALID_ARG_VALUE in errors.js #21262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2f5c0c
lib: add case of no argument to ERR_INVALID_ARG_VALUE in errors.js
AdityaSrivast Jun 11, 2018
e05f49c
lib: add case of no argument to ERR_INVALID_ARG_VALUE in errors.js
AdityaSrivast Jun 11, 2018
7af6bb3
lib: add case of bufferLength to validateOffsetLengthRead() in utils.js
AdityaSrivast Jun 11, 2018
7c1d365
lib: add case of bufferLength to validateOffsetLengthRead() in utils.js
AdityaSrivast Jun 12, 2018
8043755
lib: add empty buffer case to read and readSync function in fs
AdityaSrivast Jun 16, 2018
a8c61fd
lib: add empty buffer case to read and readSync function in fs
AdityaSrivast Jun 19, 2018
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
11 changes: 11 additions & 0 deletions lib/fs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const { Buffer, kMaxLength } = require('buffer');
const errors = require('internal/errors');
const {
ERR_FS_FILE_TOO_LARGE,
ERR_INVALID_ARG_VALUE,
ERR_INVALID_ARG_TYPE,
ERR_INVALID_CALLBACK
} = errors.codes;
Expand Down Expand Up @@ -457,6 +458,11 @@ function read(fd, buffer, offset, length, position, callback) {
});
}

if (buffer.length === 0) {
throw new ERR_INVALID_ARG_VALUE('buffer', buffer,
'is empty and cannot be written');
}

validateOffsetLengthRead(offset, length, buffer.length);

if (!Number.isSafeInteger(position))
Expand Down Expand Up @@ -487,6 +493,11 @@ function readSync(fd, buffer, offset, length, position) {
return 0;
}

if (buffer.length === 0) {
throw new ERR_INVALID_ARG_VALUE('buffer', buffer,
'is empty and cannot be written');
}

validateOffsetLengthRead(offset, length, buffer.length);

if (!Number.isSafeInteger(position))
Expand Down
6 changes: 6 additions & 0 deletions lib/internal/fs/promises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const { Buffer, kMaxLength } = require('buffer');
const {
ERR_FS_FILE_TOO_LARGE,
ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE,
ERR_METHOD_NOT_IMPLEMENTED
} = require('internal/errors').codes;
const { getPathFromURL } = require('internal/url');
Expand Down Expand Up @@ -207,6 +208,11 @@ async function read(handle, buffer, offset, length, position) {
if (length === 0)
return { bytesRead: length, buffer };

if (buffer.length === 0) {
throw new ERR_INVALID_ARG_VALUE('buffer', buffer,
'is empty and cannot be written');
}

validateOffsetLengthRead(offset, length, buffer.length);

if (!Number.isSafeInteger(position))
Expand Down
3 changes: 2 additions & 1 deletion lib/internal/fs/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ function validateOffsetLengthRead(offset, length, bufferLength) {
let err;

if (offset < 0 || offset >= bufferLength) {
err = new ERR_OUT_OF_RANGE('offset', `>= 0 && <= ${bufferLength}`, offset);
err = new ERR_OUT_OF_RANGE('offset',
`>= 0 && <= ${bufferLength}`, offset);
} else if (length < 0 || offset + length > bufferLength) {
err = new ERR_OUT_OF_RANGE('length',
`>= 0 && <= ${bufferLength - offset}`, length);
Expand Down
18 changes: 18 additions & 0 deletions test/parallel/test-fs-read-empty-buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('assert');
const fs = require('fs');
const filepath = fixtures.path('x.txt');
const fd = fs.openSync(filepath, 'r');

const buffer = new Uint8Array();

assert.throws(
() => fs.readSync(fd, buffer, 0, 10, 0),
{
code: 'ERR_INVALID_ARG_VALUE',
Copy link
Member

Choose a reason for hiding this comment

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

Can you validate the message? Something like

message: 'The argument \'buffer\' is empty and cannot be written. ' +
         'Received <Buffer >'`

should work (or whatever the actual error message is)

message: 'The argument \'buffer\' is empty and cannot be written. ' +
'Received Uint8Array [ ]'
}
);