1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: throw ERR_INVALID_ARG_VALUE when buffer being written is empty

Browse Source 
Fixes: https://github.com/nodejs/node/issues/21193
PR-URL: https://github.com/nodejs/node/pull/21262
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
AdityaSrivast 2018-06-11 19:14:52 +05:30 committed by Joyee Cheung
parent c7707a1cca
commit 42bded83e8
No known key found for this signature in database
GPG Key ID: 92B78A53C8303B8D
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/fs.js
View File

@ -47,6 +47,7 @@ const { Buffer, kMaxLength } = require('buffer');
const errors = require('internal/errors'); const errors = require('internal/errors');
const { const {
ERR_FS_FILE_TOO_LARGE, ERR_FS_FILE_TOO_LARGE,
ERR_INVALID_ARG_VALUE,
ERR_INVALID_ARG_TYPE, ERR_INVALID_ARG_TYPE,
ERR_INVALID_CALLBACK ERR_INVALID_CALLBACK
} = errors.codes; } = errors.codes;
@ -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); validateOffsetLengthRead(offset, length, buffer.length);
if (!Number.isSafeInteger(position)) if (!Number.isSafeInteger(position))
@ -487,6 +493,11 @@ function readSync(fd, buffer, offset, length, position) {
return 0; 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); validateOffsetLengthRead(offset, length, buffer.length);
if (!Number.isSafeInteger(position)) if (!Number.isSafeInteger(position))

6
lib/internal/fs/promises.js
View File

@ -12,6 +12,7 @@ const { Buffer, kMaxLength } = require('buffer');
const { const {
ERR_FS_FILE_TOO_LARGE, ERR_FS_FILE_TOO_LARGE,
ERR_INVALID_ARG_TYPE, ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE,
ERR_METHOD_NOT_IMPLEMENTED ERR_METHOD_NOT_IMPLEMENTED
} = require('internal/errors').codes; } = require('internal/errors').codes;
const { getPathFromURL } = require('internal/url'); const { getPathFromURL } = require('internal/url');
@ -208,6 +209,11 @@ async function read(handle, buffer, offset, length, position) {
if (length === 0) if (length === 0)
return { bytesRead: length, buffer }; 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); validateOffsetLengthRead(offset, length, buffer.length);
if (!Number.isSafeInteger(position)) if (!Number.isSafeInteger(position))

3
lib/internal/fs/utils.js
View File

@ -293,7 +293,8 @@ function validateOffsetLengthRead(offset, length, bufferLength) {
let err; let err;
if (offset < 0 || offset >= bufferLength) { 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) { } else if (length < 0 || offset + length > bufferLength) {
err = new ERR_OUT_OF_RANGE('length', err = new ERR_OUT_OF_RANGE('length',
`>= 0 && <= ${bufferLength - offset}`, length); `>= 0 && <= ${bufferLength - offset}`, length);

18
test/parallel/test-fs-read-empty-buffer.js Normal file
View File

@ -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',
message: 'The argument \'buffer\' is empty and cannot be written. ' +
'Received Uint8Array [ ]'
}
);