Changeset 3e1e11af

Timestamp:

2007-11-19T23:41:42Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d75597b

Parents:

7df5a08

Message:

Fixed NULL pointer dereference (in printf) when connected to a non-socket
(which I do quite often when testing stuff).

Files:

• bitlbee.c (modified) (4 diffs)
• irc.c (modified) (2 diffs)

bitlbee.c

@@ -50 +50 @@
         hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
 
-        i = getaddrinfo( global.conf->iface, global.conf->port, &hints, 
-                                                &addrinfo_bind );
+        i = getaddrinfo( global.conf->iface, global.conf->port, &hints, &addrinfo_bind );
         if( i )
         {
-                log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s", 
-                                         global.conf->iface, gai_strerror(i) );
+                log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s",
+                                           global.conf->iface, gai_strerror(i) );
                 return -1;
         }
@@ -63 +62 @@
         for( res = addrinfo_bind; res; res = res->ai_next )
         {
-                global.listen_socket = socket( res->ai_family, res->ai_socktype, 
-                                                                           res->ai_protocol );
+                global.listen_socket = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
                 if( global.listen_socket < 0 )
                         continue;
@@ -70 +68 @@
                 /* TIME_WAIT (?) sucks.. */
                 i = 1;
-                setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, 
-                                        sizeof( i ) );
+                setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
 
                 i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
@@ -119 +116 @@
                 ipc_master_load_state();
 
-        if( global.conf->runmode == RUNMODE_DAEMON || 
-                global.conf->runmode == RUNMODE_FORKDAEMON )
+        if( global.conf->runmode == RUNMODE_DAEMON || global.conf->runmode == RUNMODE_FORKDAEMON )
                 ipc_master_listen_socket();
         

irc.c

@@ -78 +78 @@
                         irc->myhost = g_strdup( ipv6_unwrap( buf ) );
                 }
-                else
-                {
-                        /* Rare, but possible. */
-                        strncpy( irc->myhost, "localhost.localdomain", NI_MAXHOST );
-                }
         }
         
@@ -94 +89 @@
                         irc->host = g_strdup( ipv6_unwrap( buf ) );
                 }
-                else
-                {
-                        /* Rare, but possible. */
-                        strncpy( irc->host, "localhost.localdomain", NI_MAXHOST );
-                }
-        }
+        }
+        
+        if( irc->host == NULL )
+                irc->host = g_strdup( "localhost.localdomain" );
+        if( irc->myhost == NULL )
+                irc->myhost = g_strdup( "localhost.localdomain" );
         
         if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )