(Closes #209) lib/mkdirs: check for invalid WIN32 path chars

jprichardson · Apr 17, 2016 · 94a3e89 · 94a3e89
1 parent 962b983
commit 94a3e89
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lib/mkdirs/__tests__/issue-209.test.js b/lib/mkdirs/__tests__/issue-209.test.js
@@ -10,7 +10,7 @@ describe('mkdirp: issue-209, win32, when bad path, should return a cleaner error
   it('should return a cleaner error than inifinite loop, stack crash', function (done) {
     var file = './bad?dir'
     fse.mkdirp(file, function (err) {
-      assert.strictEqual(err.code, 'ENOENT')
+      assert.strictEqual(err.code, 'EINVAL')
       done()
     })
   })

diff --git a/lib/mkdirs/mkdirs-sync.js b/lib/mkdirs/mkdirs-sync.js
@@ -11,6 +11,13 @@ function mkdirsSync (p, opts, made) {
   var mode = opts.mode
   var xfs = opts.fs || fs
 
+  if (process.platform === 'win32') {
+    var errInval = new Error(p + ' contains invalid WIN32 path characters.')
+    errInval.code = 'EINVAL'
+    // http://stackoverflow.com/a/62888/10333 contains more accurate
+    if (/[<>:"|?*]/.test(p)) throw errInval
+  }
+
   if (mode === undefined) {
     mode = o777 & (~process.umask())
   }

diff --git a/lib/mkdirs/mkdirs.js b/lib/mkdirs/mkdirs.js
@@ -11,6 +11,13 @@ function mkdirs (p, opts, callback, made) {
     opts = { mode: opts }
   }
 
+  if (process.platform === 'win32') {
+    var errInval = new Error(p + ' contains invalid WIN32 path characters.')
+    errInval.code = 'EINVAL'
+    // http://stackoverflow.com/a/62888/10333 contains more accurate
+    if (/[<>:"|?*]/.test(p)) return callback(errInval)
+  }
+
   var mode = opts.mode
   var xfs = opts.fs || fs
 

diff --git a/test.js b/test.js
@@ -8,7 +8,7 @@ var argv = require('minimist')(process.argv.slice(2))
 
 var mochaOpts = assign({
   ui: 'bdd',
-  reporter: 'list',
+  reporter: 'dot',
   timeout: 30000
 }, argv)