From deb6fde2ed3912fccf8107bf721e78ac6c07fc98 Mon Sep 17 00:00:00 2001 From: "viper viper@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Mon, 8 Sep 2008 23:33:39 +0000 Subject: 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 --- src/channels.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/channels.c b/src/channels.c index 89beeadc7..6720f4d71 100644 --- a/src/channels.c +++ b/src/channels.c @@ -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; -- cgit