ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StringUtil: Don't call data() on empty string_view

This commit is contained in:
Stenzek 2024-10-13 15:33:38 +10:00
parent 21ec3c1152
commit 86d66ddf82
No known key found for this signature in database
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/string_util.h
View File

@ -64,20 +64,21 @@ static inline int Strncasecmp(const char* s1, const char* s2, std::size_t n)
// Case-insensitive equality of string views. // Case-insensitive equality of string views.
static inline bool EqualNoCase(std::string_view s1, std::string_view s2) static inline bool EqualNoCase(std::string_view s1, std::string_view s2)
{ {
if (s1.length() != s2.length()) const size_t s1_len = s1.length();
const size_t s2_len = s2.length();
if (s1_len != s2_len)
return false; return false;
else if (s1_len == 0)
return true;
return (Strncasecmp(s1.data(), s2.data(), s1.length()) == 0); return (Strncasecmp(s1.data(), s2.data(), s1_len) == 0);
} }
static inline int CompareNoCase(std::string_view s1, std::string_view s2) static inline int CompareNoCase(std::string_view s1, std::string_view s2)
{ {
const size_t s1_len = s1.length(); const size_t s1_len = s1.length();
const size_t s2_len = s2.length(); const size_t s2_len = s2.length();
if (s1_len != s2_len)
return false;
const size_t compare_len = std::min(s1_len, s2_len); const size_t compare_len = std::min(s1_len, s2_len);
const int compare_res = Strncasecmp(s1.data(), s2.data(), compare_len); const int compare_res = (compare_len > 0) ? Strncasecmp(s1.data(), s2.data(), compare_len) : 0;
return (compare_len != 0) ? compare_res : ((s1_len < s2_len) ? -1 : ((s1_len > s2_len) ? 1 : 0)); return (compare_len != 0) ? compare_res : ((s1_len < s2_len) ? -1 : ((s1_len > s2_len) ? 1 : 0));
} }