Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

path_make_canonical mishandles empty string.

Browse source 
Fixes https://github.com/ridiculousfish/fishfish/issues/26
This commit is contained in:
ridiculousfish 2012-06-04 12:00:59 -07:00
parent 457e6a5f46
commit cc90f9cf80
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fish_tests.cpp
View file

@ -576,7 +576,14 @@ static void test_path()
if( canon != L"/foo/bar" ) if( canon != L"/foo/bar" )
{ {
err( L"Bug in canonical PATH code" ); err( L"Bug in canonical PATH code" );
} }
path = L"/";
path_make_canonical(path);
if (path != L"/")
{
err( L"Bug in canonical PATH code" );
}
} }
/** Test is_potential_path */ /** Test is_potential_path */

4
path.cpp
View file

@ -525,8 +525,8 @@ void path_make_canonical( wcstring &path )
replace_all(path, L"//", L"/"); replace_all(path, L"//", L"/");
} while (path.size() != size); } while (path.size() != size);
/* Remove trailing slashes */ /* Remove trailing slashes, except don't remove the first one */
while (size--) { while (size-- > 1) {
if (path.at(size) != L'/') if (path.at(size) != L'/')
break; break;
} }