path: fix normalize for absolutes

Fixes a regression introduced by b212be0. path.normalize(''/a/b/c/../../../x/y/z'') should return '/x/y/z'. Fixes: #5585 PR-URL: #5589 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Brian White <[email protected]>
nodejs · Mar 7, 2016 · 3d3b45a · 3d3b45a
1 parent 1d9a2b2
commit 3d3b45a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/path.js b/lib/path.js
@@ -44,7 +44,7 @@ function normalizeStringWin32(path, allowAboveRoot) {
               dots = 0;
               continue;
             }
-          } else if (res.length === 2) {
+          } else if (res.length === 2 || res.length === 1) {
             res = '';
             lastSlash = i;
             dots = 0;
@@ -110,7 +110,7 @@ function normalizeStringPosix(path, allowAboveRoot) {
               dots = 0;
               continue;
             }
-          } else if (res.length === 2) {
+          } else if (res.length === 2 || res.length === 1) {
             res = '';
             lastSlash = i;
             dots = 0;

diff --git a/test/parallel/test-path.js b/test/parallel/test-path.js
@@ -377,13 +377,16 @@ assert.equal(path.win32.normalize('a//b//./c'), 'a\\b\\c');
 assert.equal(path.win32.normalize('a//b//.'), 'a\\b');
 assert.equal(path.win32.normalize('//server/share/dir/file.ext'),
              '\\\\server\\share\\dir\\file.ext');
+assert.equal(path.win32.normalize('/a/b/c/../../../x/y/z'), '\\x\\y\\z');
 
 assert.equal(path.posix.normalize('./fixtures///b/../b/c.js'),
              'fixtures/b/c.js');
 assert.equal(path.posix.normalize('/foo/../../../bar'), '/bar');
 assert.equal(path.posix.normalize('a//b//../b'), 'a/b');
 assert.equal(path.posix.normalize('a//b//./c'), 'a/b/c');
 assert.equal(path.posix.normalize('a//b//.'), 'a/b');
+assert.equal(path.posix.normalize('/a/b/c/../../../x/y/z'), '/x/y/z');
+assert.equal(path.posix.normalize('///..//./foo/.//bar'), '/foo/bar');
 
 
 // path.resolve tests