util/StringCompare: use strncmp() instead of memcmp() in StringStartsWith()

Some optimized implementations of memcmp() may not start from the beginning of the string, and may thus segfault.

util/StringCompare: use strncmp() instead of memcmp() in StringStartsWith()
42f5ecd4 · Max Kellermann · 733989a2 · 42f5ecd4 · 42f5ecd4
Commit 42f5ecd4 authored Nov 06, 2015 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

WStringCompare.cxx src/util/WStringCompare.cxx +2 -1

No files found.
--- a/src/util/StringCompare.cxx
+++ b/src/util/StringCompare.cxx
@@ -36,8 +36,8 @@
 bool
 StringStartsWith(const char *haystack, const char *needle)
 {
-	const size_t length = strlen(needle);
+	const size_t length = StringLength(needle);
-	return memcmp(haystack, needle, length) == 0;
+	return StringIsEqual(haystack, needle, length);
 }
 bool

--- a/src/util/WStringCompare.cxx
+++ b/src/util/WStringCompare.cxx
@@ -26,7 +26,8 @@
 bool
 StringStartsWith(const wchar_t *haystack, const wchar_t *needle)
 {
-	return memcmp(haystack, needle, StringLength(needle) * sizeof(needle[0])) == 0;
+	const size_t length = StringLength(needle);
+	return StringIsEqual(haystack, needle, length);
 }
 bool