Changeset f536a99

Timestamp:

2008-08-25T20:48:48Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b119d5d

Parents:

f3579fd

Message:

Fixed NULL pointer dereference on trying to read non-existent settings.

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -238 +238 @@
 }
 
-static void cmd_showset( irc_t *irc, set_t *set )
-{
-        char *s;
-        
-        if( set && ( s = set_getstr( &set, set->key ) ) ) /* HACK! */
-                irc_usermsg( irc, "%s = `%s'", set->key, s );
-        else
-                irc_usermsg( irc, "%s is empty", set->key );
+static void cmd_showset( irc_t *irc, set_t **head, char *key )
+{
+        char *val;
+        
+        if( ( val = set_getstr( head, key ) ) )
+                irc_usermsg( irc, "%s = `%s'", key, val );
+        else
+                irc_usermsg( irc, "%s is empty", key );
 }
 
@@ -484 +484 @@
                         else
                         {
-                                cmd_showset( irc, set_find( &a->set, set_name ) );
+                                cmd_showset( irc, &a->set, set_name );
                         }
                 }
                 else if( set_name )
                 {
-                        cmd_showset( irc, set_find( &a->set, set_name ) );
+                        cmd_showset( irc, &a->set, set_name );
                 }
                 else
@@ -496 +496 @@
                         while( s )
                         {
-                                cmd_showset( irc, s );
+                                cmd_showset( irc, &s, s->key );
                                 s = s->next;
                         }
@@ -864 +864 @@
                 else
                 {
-                        cmd_showset( irc, set_find( &irc->set, set_name ) );
+                        cmd_showset( irc, &irc->set, set_name );
                 }
         }
         else if( set_name )
         {
-                cmd_showset( irc, set_find( &irc->set, set_name ) );
+                cmd_showset( irc, &irc->set, set_name );
 
                 if( strchr( set_name, '/' ) )
@@ -879 +879 @@
                 while( s )
                 {
-                        cmd_showset( irc, s );
+                        cmd_showset( irc, &s, s->key );
                         s = s->next;
                 }