Changeset 3e1e11af for irc.c

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).

File:

• irc.c (modified) (2 diffs)

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 )