GLINES: fix null pointer deref in trustgline / trustungline

[irc/quakenet/newserv.git] / helpmod2 / hban.c

diff --git a/helpmod2/hban.c b/helpmod2/hban.c
index dc80e3f9ed7fb6d215619f2dae722f8897172ba2..848c2bf5f6968dbeef3384b0f4e3678e3184d51c 100644 (file)
--- a/helpmod2/hban.c
+++ b/helpmod2/hban.c
@@ -40,7 +40,7 @@ hban *hban_add(const char* pat, const char* rsn, time_t exp, int now)
     { /* additional logic here */
         huser* tmpu;
        for (tmpu = husers;tmpu;tmpu = tmpu->next)
-           if (nickmatchban(tmpu->real_user, tmp) && !IsOper(tmpu->real_user))
+           if (nickmatchban(tmpu->real_user, tmp, 0) && !IsOper(tmpu->real_user))
             {
                 hchannel *assert_hchan = NULL;
                 while (tmpu->hchannels)
@@ -52,7 +52,7 @@ hban *hban_add(const char* pat, const char* rsn, time_t exp, int now)
                     }
                     assert_hchan = tmpu->hchannels->hchan;
                     helpmod_setban(tmpu->hchannels->hchan, bantostring(ptr->real_ban), HELPMOD_BAN_DURATION, MCB_ADD, now);
-                    helpmod_kick(tmpu->hchannels->hchan, tmpu, hban_get_reason(ptr));
+                    helpmod_kick(tmpu->hchannels->hchan, tmpu, "%s", hban_get_reason(ptr));
                 }
            }
     }
@@ -114,7 +114,7 @@ hban *hban_check(nick *nck)
 {
     hban *ptr = hbans;
     for (;ptr;ptr = ptr->next)
-        if (nickmatchban(nck, ptr->real_ban))
+        if (nickmatchban(nck, ptr->real_ban, 0))
             return ptr;
     return NULL;
 }