mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-03-01 07:20:00 +00:00
Code Issues Releases Wiki Activity

Fix MatchCaseInsensitive[List]](): lowercase string _and_ pattern

Browse Source 
Up to now, only the the string ("haystack") became lowercased and was
the compared to the pattern ("needle") -- which failed, when the pattern
itself wasn't all lowercase ...
This commit is contained in:
Alexander Barton 2015-05-13 23:47:53 +02:00
parent f8f7f83f5a
commit c4245220de
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ngircd/match.c
View File

@ -50,8 +50,10 @@ static int Matche_After_Star PARAMS(( const char *p, const char *t ));
GLOBAL bool GLOBAL bool
Match( const char *Pattern, const char *String ) Match( const char *Pattern, const char *String )
{ {
if( Matche( Pattern, String ) == MATCH_VALID ) return true; if (Matche(Pattern, String) == MATCH_VALID)
else return false; return true;
else
return false;
} /* Match */ } /* Match */
/** /**
@ -64,10 +66,12 @@ Match( const char *Pattern, const char *String )
GLOBAL bool GLOBAL bool
MatchCaseInsensitive(const char *Pattern, const char *String) MatchCaseInsensitive(const char *Pattern, const char *String)
{ {
char haystack[COMMAND_LEN]; char needle[COMMAND_LEN], haystack[COMMAND_LEN];
strlcpy(needle, Pattern, sizeof(needle));
strlcpy(haystack, String, sizeof(haystack)); strlcpy(haystack, String, sizeof(haystack));
return Match(Pattern, ngt_LowerStr(haystack));
return Match(ngt_LowerStr(needle), ngt_LowerStr(haystack));
} /* MatchCaseInsensitive */ } /* MatchCaseInsensitive */
/** /**
@ -82,16 +86,14 @@ GLOBAL bool
MatchCaseInsensitiveList(const char *Pattern, const char *String, MatchCaseInsensitiveList(const char *Pattern, const char *String,
const char *Separator) const char *Separator)
{ {
char tmp_pattern[COMMAND_LEN], haystack[COMMAND_LEN], *ptr; char tmp_pattern[COMMAND_LEN], *ptr;
strlcpy(tmp_pattern, Pattern, sizeof(tmp_pattern)); strlcpy(tmp_pattern, Pattern, sizeof(tmp_pattern));
strlcpy(haystack, String, sizeof(haystack));
ngt_LowerStr(haystack);
ptr = strtok(tmp_pattern, Separator); ptr = strtok(tmp_pattern, Separator);
while (ptr) { while (ptr) {
ngt_TrimStr(ptr); ngt_TrimStr(ptr);
if (Match(ptr, haystack)) if (MatchCaseInsensitive(ptr, String))
return true; return true;
ptr = strtok(NULL, Separator); ptr = strtok(NULL, Separator);
} }