mirror of
https://github.com/anope/anope.git
synced 2026-07-05 21:13:13 +02:00
BUILD : 1.7.21 (1430) BUGS : NOTES : Fixes a possible segfault in entry_match.
git-svn-id: svn://svn.anope.org/anope/trunk@1430 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1145 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
parent
8d9d51727a
commit
deb6fde2ed
+6
-6
@@ -2095,17 +2095,17 @@ int entry_match(Entry *e, char *nick, char *user, char *host, uint32 ip)
|
||||
if (ircd->cidrchanbei && (e->type & ENTRYTYPE_CIDR4) &&
|
||||
(!ip || (ip && ((ip & e->cidr_mask) != e->cidr_ip))))
|
||||
return 0;
|
||||
if ((e->type & ENTRYTYPE_NICK) && (stricmp(e->nick, nick) != 0))
|
||||
if (nick && (e->type & ENTRYTYPE_NICK) && (stricmp(e->nick, nick) != 0))
|
||||
return 0;
|
||||
if ((e->type & ENTRYTYPE_USER) && (stricmp(e->user, user) != 0))
|
||||
if (user && (e->type & ENTRYTYPE_USER) && (stricmp(e->user, user) != 0))
|
||||
return 0;
|
||||
if ((e->type & ENTRYTYPE_HOST) && (stricmp(e->host, host) != 0))
|
||||
if (host && (e->type & ENTRYTYPE_HOST) && (stricmp(e->host, host) != 0))
|
||||
return 0;
|
||||
if ((e->type & ENTRYTYPE_NICK_WILD) && !match_wild_nocase(e->nick, nick))
|
||||
if (nick && (e->type & ENTRYTYPE_NICK_WILD) && !match_wild_nocase(e->nick, nick))
|
||||
return 0;
|
||||
if ((e->type & ENTRYTYPE_USER_WILD) && !match_wild_nocase(e->user, user))
|
||||
if (user && (e->type & ENTRYTYPE_USER_WILD) && !match_wild_nocase(e->user, user))
|
||||
return 0;
|
||||
if ((e->type & ENTRYTYPE_HOST_WILD) && !match_wild_nocase(e->host, host))
|
||||
if (host && (e->type & ENTRYTYPE_HOST_WILD) && !match_wild_nocase(e->host, host))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
|
||||
+5
-1
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
|
||||
VERSION_MINOR="7"
|
||||
VERSION_PATCH="21"
|
||||
VERSION_EXTRA="-svn"
|
||||
VERSION_BUILD="1429"
|
||||
VERSION_BUILD="1430"
|
||||
|
||||
# $Log$
|
||||
#
|
||||
# BUILD : 1.7.21 (1430)
|
||||
# BUGS :
|
||||
# NOTES : Fixes a possible segfault in entry_match.
|
||||
#
|
||||
# BUILD : 1.7.21 (1429)
|
||||
# BUGS : 929
|
||||
# NOTES : Updated the help on ignore.
|
||||
|
||||
Reference in New Issue
Block a user