* Fixed a fatal bug in +take

svn: 921

doc/UPDATES

@@ -6,6 +6,7 @@ This is a summary of ChangeLog basically.
 2.Cleaned up and removed more un-needed code.
 3.Fixed a bug in defalg_user()
 4.Several user cmds on BOTS were not being shared.
+5.Fixed a fatal bug in +take.
 
 1.1.5
 

src/chanprog.c

@@ -76,9 +76,10 @@ memberlist *ismember(struct chanset_t *chan, char *nick)
 {
   register memberlist	*x = NULL;
 
-  for (x = chan->channel.member; x && x->nick[0]; x = x->next)
-    if (!rfc_casecmp(x->nick, nick))
-      return x;
+  if (chan && nick && nick[0])
+    for (x = chan->channel.member; x && x->nick[0]; x = x->next)
+      if (!rfc_casecmp(x->nick, nick))
+        return x;
   return NULL;
 }
 

src/mod/irc.mod/chan.c

@@ -1043,7 +1043,7 @@ do_take(struct chanset_t *chan)
     int hasop = (m->flags & CHANOP);
 
 
-    if (m && !match_my_nick(m->nick)) {
+    if (m && rfc_casecmp(m->nick, botname)) {
       if (m->user && (m->user->flags & USER_BOT) && !hasop) {
         strcat(to_op, m->nick);
         strcat(to_op, " ");
@@ -1089,6 +1089,7 @@ do_take(struct chanset_t *chan)
     if (lines == 5) {
       tputs(serv, work, strlen(work));
       work[0] = 0;
+      lines = 0;
     }
   }