meta: merge node/master into node-chakracore/master

Merge 71396a2 as of 2017-12-27
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Taylor Woll <tawoll@ntdev.microsoft.com>

Author: chakrabot

lib/fs.js

@@ -340,6 +340,10 @@ fs.accessSync = function(path, mode) {
 fs.exists = function(path, callback) {
   if (handleError((path = getPathFromURL(path)), cb))
     return;
+  if (typeof path !== 'string' && !(path instanceof Buffer)) {
+    throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'path',
+                               ['string', 'Buffer', 'URL']);
+  }
   if (!nullCheck(path, cb)) return;
   var req = new FSReqWrap();
   req.oncomplete = cb;
@@ -361,6 +365,9 @@ Object.defineProperty(fs.exists, internalUtil.promisify.custom, {
 fs.existsSync = function(path) {
   try {
     handleError((path = getPathFromURL(path)));
+    if (typeof path !== 'string' && !(path instanceof Buffer)) {
+      return false;
+    }
     nullCheck(path);
     binding.stat(pathModule.toNamespacedPath(path));
     return true;
@@ -389,6 +396,9 @@ fs.readFile = function(path, options, callback) {
       req.oncomplete(null, path);
     });
     return;
+  } else if (typeof path !== 'string' && !(path instanceof Buffer)) {
+    throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'path',
+                               ['string', 'Buffer', 'URL']);
   }
 
   binding.open(pathModule.toNamespacedPath(path),

test/parallel/test-fs-exists.js

@@ -42,3 +42,14 @@ fs.exists(new URL('https://foo'), common.mustCall(function(y) {
 
 assert(fs.existsSync(f));
 assert(!fs.existsSync(`${f}-NO`));
+
+common.expectsError(
+  () => { fs.exists(() => {}); },
+  {
+    code: 'ERR_INVALID_ARG_TYPE',
+    message: 'The "path" argument must be one of type string, Buffer, or URL',
+    type: TypeError
+  }
+);
+
+assert(!fs.existsSync());

test/parallel/test-fs-readfile-error.js

@@ -21,6 +21,7 @@
 
 'use strict';
 const common = require('../common');
+const fs = require('fs');
 
 // Test that fs.readFile fails correctly on a non-existent file.
 
@@ -54,3 +55,12 @@ test({ NODE_DEBUG: 'fs' }, common.mustCall((data) => {
   assert(/EISDIR/.test(data));
   assert(/test-fs-readfile-error/.test(data));
 }));
+
+common.expectsError(
+  () => { fs.readFile(() => {}); },
+  {
+    code: 'ERR_INVALID_ARG_TYPE',
+    message: 'The "path" argument must be one of type string, Buffer, or URL',
+    type: TypeError
+  }
+);