Changeset 99f929c for protocols/msn/ns.c

Timestamp:

2008-04-21T21:53:15Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

23c4e64

Parents:

aefaac3a

Message:

Now checking if msn_sb_create() returns NULL. This is very unlikely, but
can happen if we run out of file descriptors, for example.

File:

• protocols/msn/ns.c (modified) (2 diffs)

protocols/msn/ns.c

@@ -178 +178 @@
                         
                         debug( "Connecting to a new switchboard with key %s", cmd[5] );
-                        sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW );
+
+                        if( ( sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW ) ) == NULL )
+                        {
+                                /* Although this isn't strictly fatal for the NS connection, it's
+                                   definitely something serious (we ran out of file descriptors?). */
+                                imcb_error( ic, "Could not create new switchboard" );
+                                imc_logout( ic, TRUE );
+                                return( 0 );
+                        }
                         
                         if( md->msgq )
@@ -468 +476 @@
                 debug( "Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4] );
                 
-                sb = msn_sb_create( ic, server, port, cmd[4], session );
-                sb->who = g_strdup( cmd[5] );
+                if( ( sb = msn_sb_create( ic, server, port, cmd[4], session ) ) == NULL )
+                {
+                        /* Although this isn't strictly fatal for the NS connection, it's
+                           definitely something serious (we ran out of file descriptors?). */
+                        imcb_error( ic, "Could not create new switchboard" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                else
+                {
+                        sb->who = g_strdup( cmd[5] );
+                }
         }
         else if( strcmp( cmd[0], "ADD" ) == 0 )