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.

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

fs: require callback in read #22146

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
fs: require callback in read
Currently the read operation did not require the callback and that
was an oversight when callbacks became mandatory.
  • Loading branch information
BridgeAR committed Aug 6, 2018
commit 54b44a273440f26172ade69c5ebe87778ae85f99
5 changes: 3 additions & 2 deletions lib/fs.js
Original file line number Diff line number Diff line change
@@ -445,13 +445,14 @@ function openSync(path, flags, mode) {
function read(fd, buffer, offset, length, position, callback) {
validateUint32(fd, 'fd');
validateBuffer(buffer);
callback = maybeCallback(callback);

offset |= 0;
length |= 0;

if (length === 0) {
return process.nextTick(function tick() {
callback && callback(null, 0, buffer);
callback(null, 0, buffer);
});
}

@@ -467,7 +468,7 @@ function read(fd, buffer, offset, length, position, callback) {

function wrapper(err, bytesRead) {
// Retain a reference to buffer so that it can't be GC'ed too soon.
callback && callback(err, bytesRead || 0, buffer);
callback(err, bytesRead || 0, buffer);
}

const req = new FSReqCallback();
9 changes: 8 additions & 1 deletion test/parallel/test-fs-read.js
Original file line number Diff line number Diff line change
@@ -58,7 +58,6 @@ test(new Uint8Array(expected.length),
// Reading beyond file length (3 in this case) should return no data.
// This is a test for a bug where reads > uint32 would return data
// from the current position in the file.
const fd = fs.openSync(filepath, 'r');
const pos = 0xffffffff + 1; // max-uint32 + 1
const nRead = fs.readSync(fd, Buffer.alloc(1), 0, 1, pos);
assert.strictEqual(nRead, 0);
@@ -68,3 +67,11 @@ test(new Uint8Array(expected.length),
assert.strictEqual(nRead, 0);
}));
}

assert.throws(
() => fs.read(fd, Buffer.alloc(1), 0, 1, 0),
{
message: 'Callback must be a function',
code: 'ERR_INVALID_CALLBACK',
}
);