Changeset 15581c1

Timestamp:

2012-06-05T22:34:13Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aa88e50

Parents:

222b440

Message:

Fixed some small leaks, restored proper read buffer size.

File:

• storage_xml.c (modified) (6 diffs)

storage_xml.c

@@ -67 +67 @@
         {
                 char *name = xt_find_attr( c, "name" );
+                
+                if( !name )
+                        continue;
                 
                 if( strcmp( node->name, "account" ) == 0 )
@@ -169 +172 @@
 {
         struct xml_parsedata xd[1];
-        char *fn, buf[204];
+        char *fn, buf[2048];
         int fd, st;
         struct xt_parser *xp;
@@ -225 +228 @@
         
         /* DO NOT call xt_handle() before verifying the password! */
-        if( xt_handle( xp, NULL, -1 ) == XT_HANDLED )
+        if( xt_handle( xp, NULL, 1 ) == XT_HANDLED )
                 ret = STORAGE_OK;
         
@@ -231 +234 @@
         
 error:
+        xt_free( xp );
+        g_free( fn );
         return ret;
 }
@@ -349 +354 @@
 }
 
+static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data )
+{
+        struct xt_node *node = xt_new_node( "buddy", NULL, NULL );
+        xt_add_attr( node, "handle", key );
+        xt_add_attr( node, "nick", value );
+        xt_add_child( (struct xt_node *) data, node );
+        
+        return FALSE;
+}
+
 static storage_status_t xml_save( irc_t *irc, int overwrite )
 {
@@ -401 +416 @@
         
         return ret;
-}
-
-static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data )
-{
-        struct xt_node *node = xt_new_node( "buddy", NULL, NULL );
-        xt_add_attr( node, "handle", key );
-        xt_add_attr( node, "nick", value );
-        xt_add_child( (struct xt_node *) data, node );
-        
-        return FALSE;
 }