Changeset 6523

Timestamp:

Aug 14, 2008, 2:49:44 PM (14 years ago)

Author:

charles

Message:

(1.3x) backport the memory leak fixes: r6519, r6516, and r6515

Location:

branches/1.3x

Files:

• gtk/main.c (modified) (1 diff)
• gtk/util.c (modified) (1 diff)
• libtransmission/rpc.c (modified) (1 diff)

branches/1.3x/gtk/main.c

@@ -999 +999 @@
     else if( !strcmp( key, PREF_KEY_RPC_ACL ) )
     {
-        char * err = NULL;
         const char * s = pref_string_get( key );
-        tr_sessionSetRPCACL( tr, s, &err );
+        tr_sessionSetRPCACL( tr, s, NULL );
     }
     else if( !strcmp( key, PREF_KEY_RPC_USERNAME ) )

branches/1.3x/gtk/util.c

@@ -494 +494 @@
     if( err )
        g_message( "err: %s", err->message );
+
+    if( proxy )
+        g_object_unref( proxy );
+    if( conn )
+        dbus_g_connection_unref( conn );
 #endif
     return success;

branches/1.3x/libtransmission/rpc.c

@@ -359 +359 @@
     tr_benc * list = tr_bencDictAddList( args_out, "torrents", torrentCount );
     tr_benc * fields;
+    char * msg = NULL;
 
     if( !tr_bencDictFindList( args_in, "fields", &fields ) )
-        return "no fields specified";
-
-    for( i=0; i<torrentCount; ++i )
+        msg = "no fields specified";
+    else for( i=0; i<torrentCount; ++i )
         addInfo( torrents[i], tr_bencListAdd( list ), fields );
 
     tr_free( torrents );
-    return NULL;
+    return msg;
 }