Some clang static analyzer fixes.

[irc/rqf/shadowircd.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 74767f4d57880f3a08064a2e5c15cb237c7cede8..88f187011d4a789a88161acc38b1741c879ae21d 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: channel.c 3580 2007-11-07 23:45:14Z jilles $
  */
 
 #include "stdinc.h"
@@ -107,6 +106,7 @@ free_channel(struct Channel *chptr)
 {
        channel_metadata_clear(chptr);
        rb_free(chptr->chname);
+       rb_free(chptr->mode_lock);
        rb_bh_free(channel_heap, chptr);
 }
 
@@ -826,7 +826,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_althost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char *text = rb_strdup("");
+       char text[10];
        int use_althost = 0;
        int i = 0;
        hook_data_channel moduledata;
@@ -857,14 +857,14 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN)
                return (ERR_BANNEDFROMCHAN);
 
-       rb_sprintf(text, "K%s", source_p->id);
+       rb_snprintf(text, sizeof(text), "K%s", source_p->id);
 
        DICTIONARY_FOREACH(md, &iter, chptr->metadata)
        {
-               if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))
+               if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time()))
                        return ERR_KICKNOREJOIN;
                /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */
-               if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))  
+               if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time()))  
                        channel_metadata_delete(chptr, md->name, 0);
        }
 
@@ -1830,7 +1830,10 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
                                continue;
                        }
 
-                       flags = CHFL_CHANOP;
+                       if(ConfigChannel.admin_on_channel_create && ConfigChannel.use_admin)
+                               flags = CHFL_ADMIN | CHFL_CHANOP;
+                       else
+                               flags = CHFL_CHANOP;
                }
 
                if((rb_dlink_list_length(&source_p->user->channel) >=