GLINES: fix null pointer deref in trustgline / trustungline

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

diff --git a/helpmod2/hchannel.c b/helpmod2/hchannel.c
index 57a59368d99979ad8075a10042a7904f7c6cb8f7..d511bcfeac4f92f0900d1c5114fe4dbf2ce449c5 100644 (file)
--- a/helpmod2/hchannel.c
+++ b/helpmod2/hchannel.c
@@ -102,7 +102,7 @@ int hchannel_del(hchannel *hchan)
     while (hchan->htickets)
         hticket_del(hchan->htickets, hchan);
 
-    localpartchannel(helpmodnick, hchan->real_channel);
+    localpartchannel(helpmodnick, hchan->real_channel, "Channel Removed");
 
     free(hchan);
 
@@ -210,16 +210,16 @@ void hchannel_remove_inactive_users(void)
                if (
                    (huser_get_level((*hchanuser)->husr) == H_PEON) &&
                    (time(NULL) - huser_on_channel((*hchanuser)->husr,hchan)->last_activity >= hchan->max_idle) &&
-                   !(on_queue((*hchanuser)->husr, huser_on_channel((*hchanuser)->husr, hchan))) &&
-                    !IsSetHost((*hchanuser)->husr->real_user)
+                   !(on_queue((*hchanuser)->husr, huser_on_channel((*hchanuser)->husr, hchan)))
                   )
                {
                    if (huser_on_channel((*hchanuser)->husr, hchan)->flags & H_IDLE_WARNING)
                     {
                         const char *banmask = hban_ban_string((*hchanuser)->husr->real_user, HBAN_HOST);
-                        helpmod_setban(hchan, banmask, time(NULL) + 10 * HDEF_m, MCB_ADD, HLAZY);
+                        int bantime = 10;
+                        helpmod_setban(hchan, banmask, time(NULL) + bantime * HDEF_m, MCB_ADD, HLAZY);
 
-                        helpmod_kick(hchan, (*hchanuser)->husr, "Please do not idle in %s", hchannel_get_name(hchan));
+                        helpmod_kick(hchan, (*hchanuser)->husr, "Please do not idle in %s (%dmin anti-idle tempban). If you still require assistance, please try again later.", hchannel_get_name(hchan), bantime);
                         continue;
                     }
                     else
@@ -331,6 +331,7 @@ void hchannels_dnmo(struct huser_struct *husr)
                         break;
                 }
             *hchanuser = tmp;
+            assert(*hchanuser != NULL);
             (*hchanuser)->next = NULL;
             if (on_desk(husr, huserchan))
             {