fix new autojoin crash bug

[irc/evilnet/x3.git] / src / spamserv.c

diff --git a/src/spamserv.c b/src/spamserv.c
index 09079297c94219ec4e16f2db2a0f92c5ef58acfb..fdca15f32be70d22850be2d9143ef4491db9b597 100644 (file)
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -1811,27 +1811,28 @@ spamserv_channel_message(struct chanNode *channel, struct userNode *user, char *
        char reason[MAXLEN];
 
        /* make sure: spamserv is not disabled; x3 is running; spamserv is in the chan; chan is regged, user does exist */
-       if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
+       if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || IsOper(user) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
                return;
 
+       
        if(!CHECK_CHANOPS(cInfo))
        {
                struct modeNode *mn = GetUserMode(channel, user);
-               if(mn->modes & MODE_CHANOP)
+               if (mn && (mn->modes & MODE_CHANOP))
                        return;
        }
 
        if(!CHECK_HALFOPS(cInfo))
        {
                struct modeNode *mn = GetUserMode(channel, user);
-               if(mn->modes & MODE_HALFOP)
+               if (mn && (mn->modes & MODE_HALFOP))
                        return;
        }
        
        if(!CHECK_VOICED(cInfo))
        {
                struct modeNode *mn = GetUserMode(channel, user);
-               if((mn->modes & MODE_VOICE) && !(mn->modes & MODE_CHANOP) && !(mn->modes & MODE_HALFOP))
+               if (mn && ((mn->modes & MODE_VOICE) && !(mn->modes & MODE_CHANOP) && !(mn->modes & MODE_HALFOP)))
                        return;
        }