Changeset 1145964

Timestamp:

2008-06-29T11:11:50Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cd63d58

Parents:

565a1ea

Message:

Fixed two memory leaks in the MSN module.

File:

• protocols/msn/ns.c (modified) (2 diffs)

protocols/msn/ns.c

@@ -278 +278 @@
                 if( num_parts == 5 )
                 {
+                        int i, groupcount;
+                        
+                        groupcount = atoi( cmd[4] );
+                        if( groupcount > 0 )
+                        {
+                                /* valgrind says this is leaking memory, I'm guessing
+                                   that this happens during server redirects. */
+                                if( md->grouplist )
+                                {
+                                        for( i = 0; i < md->groupcount; i ++ )
+                                                g_free( md->grouplist[i] );
+                                        g_free( md->grouplist );
+                                }
+                                
+                                md->groupcount = groupcount;
+                                md->grouplist = g_new0( char *, md->groupcount );
+                        }
+                        
                         md->buddycount = atoi( cmd[3] );
-                        md->groupcount = atoi( cmd[4] );
-                        if( md->groupcount > 0 )
-                                md->grouplist = g_new0( char *, md->groupcount );
-                        
                         if( !*cmd[3] || md->buddycount == 0 )
                                 msn_logged_in( ic );
@@ -665 +679 @@
                                         imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
+                                
+                                g_free( inbox );
+                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )