Changeset 99c8f13 for protocols/yahoo

Timestamp:

2009-10-17T14:48:21Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

57d8421

Parents:

e71cfbc

Message:

Valgrind pointed me at some memory leaks in the Yahoo! codek, including one
that existed for a while already. Fixed.

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (2 diffs)
• yahoo.c (modified) (1 diff)

protocols/yahoo/libyahoo2.c

@@ -2486 +2486 @@
         yahoo_packet_free(pack);
         
-        return;
-        
 fail:
+        g_free(crumb);
         g_free(had->token);
         g_free(had->chal);
@@ -4135 +4134 @@
         LOG(("yahoo_logoff: current status: %d", yd->current_status));
 
-        if(yd->current_status != -1) {
+        if(yd->current_status != -1 && 0) {
+                /* Meh. Don't send this. The event handlers are not going to
+                   get to do this so it'll just leak memory. And the TCP
+                   connection reset will hopefully be clear enough. */
                 pkt = yahoo_packet_new(YAHOO_SERVICE_LOGOFF, YAHOO_STATUS_AVAILABLE, yd->session_id);
                 yd->current_status = -1;

protocols/yahoo/yahoo.c

@@ -254 +254 @@
 static GList *byahoo_away_states( struct im_connection *ic )
 {
-        GList *m = NULL;
-
-        m = g_list_append( m, "Available" );
-        m = g_list_append( m, "Be Right Back" );
-        m = g_list_append( m, "Busy" );
-        m = g_list_append( m, "Not At Home" );
-        m = g_list_append( m, "Not At Desk" );
-        m = g_list_append( m, "Not In Office" );
-        m = g_list_append( m, "On Phone" );
-        m = g_list_append( m, "On Vacation" );
-        m = g_list_append( m, "Out To Lunch" );
-        m = g_list_append( m, "Stepped Out" );
-        m = g_list_append( m, "Invisible" );
-        m = g_list_append( m, GAIM_AWAY_CUSTOM );
+        static GList *m = NULL;
+
+        if( m == NULL )
+        {
+                m = g_list_append( m, "Available" );
+                m = g_list_append( m, "Be Right Back" );
+                m = g_list_append( m, "Busy" );
+                m = g_list_append( m, "Not At Home" );
+                m = g_list_append( m, "Not At Desk" );
+                m = g_list_append( m, "Not In Office" );
+                m = g_list_append( m, "On Phone" );
+                m = g_list_append( m, "On Vacation" );
+                m = g_list_append( m, "Out To Lunch" );
+                m = g_list_append( m, "Stepped Out" );
+                m = g_list_append( m, "Invisible" );
+                m = g_list_append( m, GAIM_AWAY_CUSTOM );
+        }
         
         return m;