oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Traits: allow base to end with a slash in Relative()

Browse Source 
Fixes false negatives:

 http://foo/dav/example.ogg mismatches http://foo/dav/

.. because StringAfterPrefix() returns just "example.ogg", without
trailing slash (it existed, but was eaten already by the base
matcher).
This commit is contained in:
Max Kellermann 2017-02-24 13:50:29 +01:00
parent ca559b1db6
commit cd522f524d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fs/Traits.cxx
View File

@ -99,9 +99,16 @@ RelativePathImpl(typename Traits::const_pointer_type base,
return nullptr; return nullptr;
if (*other != 0) { if (*other != 0) {
if (!Traits::IsSeparator(*other)) if (!Traits::IsSeparator(*other)) {
if (*base != 0 && Traits::IsSeparator(other[-1]))
/* "other" has no more slash, but the
matching base ended with a slash:
enough to detect a match */
return other;
/* mismatch */ /* mismatch */
return nullptr; return nullptr;
}
/* skip remaining path separators */ /* skip remaining path separators */
do { do {