Changeset 6d5eb72

Timestamp:

2008-12-14T01:14:55Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e1720ce

Parents:

549545b

Message:

Added more chat.c sanity checks that were (embarassingly) missing so far.

File:

• chat.c (modified) (2 diffs)

chat.c

@@ -31 +31 @@
         set_t *s;
 
-        if( acc->prpl->chat_join == NULL )
+        if( acc->prpl->chat_join == NULL || !chat_chanok( channel ) ||
+            chat_chancmp( channel, irc->channel ) == 0 )
+        {
                 return NULL;
-        
-        if( !chat_chanok( channel ) )
-                return NULL;
-        
-        if( chat_chancmp( channel, irc->channel ) == 0 )
-                return NULL;
+        }
         
         for( c = irc->chatrooms; c; c = c->next )
@@ -177 +174 @@
         struct groupchat *gc;
         char *nick = set_getstr( &c->set, "nick" );
+
+        if( c->acc->ic == NULL || c->acc->prpl->chat_join == NULL )
+                return 0;
         
         if( nick == NULL )
                 nick = irc->nick;
         
-        if( c->acc->prpl->chat_join &&
-            ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, password ) ) )
+        if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, password ) ) )
         {
                 g_free( gc->channel );