Changeset 00ab350

Timestamp:

2006-06-21T17:14:49Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

812a413

Parents:

2b14eef

Message:

Fixed GError memory leak, correctly setting the migrate_storage default.

Files:

• conf.c (modified) (2 diffs)
• storage_xml.c (modified) (2 diffs)

conf.c

@@ -42 +42 @@
 conf_t *conf_load( int argc, char *argv[] )
 {
-        char *mig_list[2] = { "text", NULL };
         conf_t *conf;
         int opt, i;
@@ -57 +56 @@
         conf->verbose = 0;
         conf->primary_storage = "xml";
-        conf->migrate_storage = mig_list;
+        conf->migrate_storage = g_strsplit( "text", ",", -1 );
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;

storage_xml.c

@@ -288 +288 @@
                         /* Slightly dirty... */
                         if( gerr && strcmp( gerr->message, XML_PASS_ERRORMSG ) == 0 )
+                        {
+                                g_clear_error( &gerr );
                                 return STORAGE_INVALID_PASSWORD;
+                        }
                         else
                         {
@@ -294 +297 @@
                                         irc_usermsg( irc, "Error from XML-parser: %s", gerr->message );
                                 
+                                g_clear_error( &gerr );
                                 return STORAGE_OTHER_ERROR;
                         }
                 }
         }
+        /* Just to be sure... */
+        g_clear_error( &gerr );
         
         g_markup_parse_context_free( ctx );