util/UriRelative: allow "parent" to end with slash

58363cf4 · Max Kellermann · 2574615f · 58363cf4
Commit 58363cf4 authored Sep 07, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

UriRelative.cxx src/util/UriRelative.cxx +2 -2

No files found.
--- a/src/util/UriRelative.cxx
+++ b/src/util/UriRelative.cxx
@@ -44,8 +44,8 @@ uri_is_child(const char *parent, const char *child) noexcept
 #endif

 	const char *suffix = StringAfterPrefix(child, parent);
-	return suffix != nullptr &&
-		*suffix == '/';
+	return suffix != nullptr && *suffix != 0 &&
+		(suffix == child || suffix[-1] == '/' || *suffix == '/');
 }