Changeset 13fa2db

Timestamp:

2010-07-27T22:24:59Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3b3c50d9

Parents:

4255320

Message:

Don't crash when trying to join a channel with an invalid name.

File:

• irc_commands.c (modified) (2 diffs)

irc_commands.c

@@ -140 +140 @@
                         *comma = '\0';
                 
-                if( ( ic = irc_channel_by_name( irc, s ) ) == NULL )
-                {
-                        ic = irc_channel_new( irc, s );
-                        
+                if( ( ic = irc_channel_by_name( irc, s ) ) == NULL &&
+                    ( ic = irc_channel_new( irc, s ) ) )
+                {
                         if( strcmp( set_getstr( &ic->set, "type" ), "control" ) != 0 )
                         {
@@ -163 +162 @@
                         else
                         {
+                                /* The set commands above will run this already,
+                                   but if we didn't hit any, we have to fill the
+                                   channel with the default population. */
                                 bee_irc_channel_update( ic->irc, ic, NULL );
                         }
                 }
-                
-                if( ic == NULL )
+                else if( ic == NULL )
                 {
                         irc_send_num( irc, 479, "%s :Invalid channel name", s );