Changeset 911d97a

Timestamp:

2011-08-04T15:19:54Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7732193

Parents:

f988ad3

Message:

Error handling fixes.

Found one double free() bug causing troubles when a buddy_msg() handler takes
down the IM connection immediately.

Files:

• irc_im.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (1 diff)

irc_im.c

@@ -451 +451 @@
 {
         irc_user_t *iu = data;
-        char *msg = g_string_free( iu->pastebuf, FALSE );
+        char *msg;
         GSList *l;
+        
+        msg = g_string_free( iu->pastebuf, FALSE );
+        iu->pastebuf = NULL;
+        iu->pastebuf_timer = 0;
         
         for( l = irc_plugins; l; l = l->next )
@@ -479 +483 @@
         
         g_free( msg );
-        iu->pastebuf = NULL;
-        iu->pastebuf_timer = 0;
         
         return FALSE;

protocols/jabber/jabber.c

@@ -319 +319 @@
                         imcb_error( ic, "OAuth failure" );
                         imc_logout( ic, TRUE );
+                        return 0;
                 }
         }

protocols/jabber/sasl.c

@@ -448 +448 @@
 {
         struct im_connection *ic = data;
-        imcb_remove_buddy( ic, "jabber_oauth", NULL );
+        if( g_slist_find( jabber_connections, ic ) )
+                imcb_remove_buddy( ic, "jabber_oauth", NULL );
         return FALSE;
 }