Changeset d50e22f

Timestamp:

2010-06-08T22:22:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d7db346

Parents:

f1cea66 (diff), 04a927c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging memory leak fixes from devel, time to find the ui-fix-specific
leaks.

Files:

• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (1 diff)
• storage_xml.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -300 +300 @@
                 g_hash_table_destroy( jd->node_cache );
         
+        jabber_buddy_remove_all( ic );
+        
         xt_free( jd->xt );
         

protocols/jabber/jabber.h

@@ -292 +292 @@
 int jabber_buddy_remove( struct im_connection *ic, char *full_jid );
 int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid );
+void jabber_buddy_remove_all( struct im_connection *ic );
 time_t jabber_get_timestamp( struct xt_node *xt );
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns );

protocols/jabber/jabber_util.c

@@ -669 +669 @@
 }
 
+static gboolean jabber_buddy_remove_all_cb( gpointer key, gpointer value, gpointer data )
+{
+        struct jabber_buddy *bud, *next;
+        
+        bud = value;
+        while( bud )
+        {
+                next = bud->next;
+                g_free( bud->ext_jid );
+                g_free( bud->full_jid );
+                g_free( bud->away_message );
+                g_free( bud );
+                bud = next;
+        }
+        
+        return TRUE;
+}
+
+void jabber_buddy_remove_all( struct im_connection *ic )
+{
+        struct jabber_data *jd = ic->proto_data;
+        
+        g_hash_table_foreach_remove( jd->buddies, jabber_buddy_remove_all_cb, NULL );
+        g_hash_table_destroy( jd->buddies );
+}
+
 time_t jabber_get_timestamp( struct xt_node *xt )
 {

protocols/twitter/twitter.c

@@ -236 +236 @@
         {
                 oauth_info_free( td->oauth_info );
+                g_free( td->url_host );
+                g_free( td->url_path );
                 g_free( td->pass );
                 g_free( td );

storage_xml.c

@@ -404 +404 @@
                 return STORAGE_ALREADY_EXISTS;
         
-        strcat( path, "~" );
-        if( ( fd = open( path, O_WRONLY | O_CREAT | O_TRUNC, 0600 ) ) < 0 )
+        strcat( path, ".XXXXXX" );
+        if( ( fd = mkstemp( path ) ) < 0 )
         {
                 irc_usermsg( irc, "Error while opening configuration file." );
@@ -501 +501 @@
         close( fd );
         
-        path2 = g_strndup( path, strlen( path ) - 1 );
+        path2 = g_strndup( path, strlen( path ) - 7 );
         if( rename( path, path2 ) != 0 )
         {