Permalink
Browse files

fs: do not pass Buffer when toString() fails

Even though an Error object is passed to the callback when readFile()
fails due to toString() failing, it is a bit strange to still see
data passed as the second argument. This commit changes that and only
passes the Error object in that case.

PR-URL: #9670
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information...
mscdex committed Nov 18, 2016
1 parent 4f97a14 commit f3cf8e98081b52003bfe3c10f27f29c1c49e800a
Showing with 5 additions and 7 deletions.
  1. +4 −7 lib/fs.js
  2. +1 −0 test/parallel/test-fs-readfile-tostring-fail.js
View
@@ -396,8 +396,8 @@ function readFileAfterClose(err) {
var buffer = null;
var callback = context.callback;
if (context.err)
return callback(context.err);
if (context.err || err)
return callback(context.err || err);
if (context.size === 0)
buffer = Buffer.concat(context.buffers, context.pos);
@@ -406,8 +406,6 @@ function readFileAfterClose(err) {
else
buffer = context.buffer;
if (err) return callback(err, buffer);
if (context.encoding) {
return tryToString(buffer, context.encoding, callback);
}
@@ -416,13 +414,12 @@ function readFileAfterClose(err) {
}
function tryToString(buf, encoding, callback) {
var e = null;
try {
buf = buf.toString(encoding);
} catch (err) {
e = err;
return callback(err);
}
callback(e, buf);
callback(null, buf);
}
function tryStatSync(fd, isUserFd) {
@@ -33,6 +33,7 @@ stream.on('finish', common.mustCall(function() {
fs.readFile(file, 'utf8', common.mustCall(function(err, buf) {
assert.ok(err instanceof Error);
assert.strictEqual('"toString()" failed', err.message);
assert.strictEqual(buf, undefined);
}));
}));

0 comments on commit f3cf8e9

Please sign in to comment.