util/UriRelative: use StringAfterPrefix() instead of memcmp()

memcmp() can overrun the buffer.

util/UriRelative: use StringAfterPrefix() instead of memcmp()
2574615f · Max Kellermann · 15fbd2b4 · 2574615f
Commit 2574615f authored Sep 07, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

UriRelative.cxx src/util/UriRelative.cxx +4 -3

No files found.
--- a/src/util/UriRelative.cxx
+++ b/src/util/UriRelative.cxx
@@ -29,6 +29,7 @@
 #include "UriRelative.hxx"
 #include "StringAPI.hxx"
+#include "StringCompare.hxx"
 #include <assert.h>
 #include <string.h>
@@ -42,9 +43,9 @@ uri_is_child(const char *parent, const char *child) noexcept
 	assert(child != nullptr);
 #endif
-	const size_t parent_length = strlen(parent);
+	const char *suffix = StringAfterPrefix(child, parent);
-	return memcmp(parent, child, parent_length) == 0 &&
+	return suffix != nullptr &&
-		child[parent_length] == '/';
+		*suffix == '/';
 }