fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 16:26:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

FFstrbuf: improves robustness of ffStrbufMatchSeparatedNS

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
李通洲
2026-04-27 22:49:31 +08:00
parent 3883047dce
commit d79e1d7fbc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/impl/FFstrbuf.c
+6 -4
View File
@@ -790,9 +790,10 @@ bool ffStrbufMatchSeparatedNS(const FFstrbuf* strbuf, uint32_t compLength, const
}
for (const char* p = comp; p < comp + compLength;) {
const char* colon = memchr(p, separator, compLength);
const char* colon = memchr(p, separator, (size_t)(comp + compLength - p));
if (colon == NULL) {
return strcmp(strbuf->chars, p) == 0;
uint32_t remainingLen = (uint32_t)(comp + compLength - p);
return strbuf->length == remainingLen && memcmp(strbuf->chars, p, remainingLen) == 0;
}
uint32_t substrLength = (uint32_t) (colon - p);
@@ -817,9 +818,10 @@ bool ffStrbufMatchSeparatedIgnCaseNS(const FFstrbuf* strbuf, uint32_t compLength
}
for (const char* p = comp; p < comp + compLength;) {
const char* colon = memchr(p, separator, compLength);
const char* colon = memchr(p, separator, (size_t)(comp + compLength - p));
if (colon == NULL) {
return strcasecmp(strbuf->chars, p) == 0;
uint32_t remainingLen = (uint32_t)(comp + compLength - p);
return strbuf->length == remainingLen && strncasecmp(strbuf->chars, p, remainingLen) == 0;
}
uint32_t substrLength = (uint32_t) (colon - p);