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

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).

fs/Traits: allow base to end with a slash in Relative()
cd522f52 · Max Kellermann · ca559b1d · cd522f52
Commit cd522f52 authored Feb 24, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

Traits.cxx src/fs/Traits.cxx +8 -1

No files found.
--- a/src/fs/Traits.cxx
+++ b/src/fs/Traits.cxx
@@ -99,9 +99,16 @@ RelativePathImpl(typename Traits::const_pointer_type base,
 		return nullptr;

 	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 */
 			return nullptr;
+		}

 		/* skip remaining path separators */
 		do {