Skip to content

Commit

Permalink
path: fix normalize for absolutes
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
evanlucas authored and Fishrock123 committed Mar 8, 2016
1 parent 7be726f commit f3971f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/path.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions test/parallel/test-path.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f3971f5

Please sign in to comment.