Changeset 6523


Ignore:
Timestamp:
Aug 14, 2008, 2:49:44 PM (13 years ago)
Author:
charles
Message:

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

Location:
branches/1.3x
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3x/gtk/main.c

    r6489 r6523  
    999999    else if( !strcmp( key, PREF_KEY_RPC_ACL ) )
    10001000    {
    1001         char * err = NULL;
    10021001        const char * s = pref_string_get( key );
    1003         tr_sessionSetRPCACL( tr, s, &err );
     1002        tr_sessionSetRPCACL( tr, s, NULL );
    10041003    }
    10051004    else if( !strcmp( key, PREF_KEY_RPC_USERNAME ) )
  • branches/1.3x/gtk/util.c

    r6402 r6523  
    494494    if( err )
    495495       g_message( "err: %s", err->message );
     496
     497    if( proxy )
     498        g_object_unref( proxy );
     499    if( conn )
     500        dbus_g_connection_unref( conn );
    496501#endif
    497502    return success;
  • branches/1.3x/libtransmission/rpc.c

    r6489 r6523  
    359359    tr_benc * list = tr_bencDictAddList( args_out, "torrents", torrentCount );
    360360    tr_benc * fields;
     361    char * msg = NULL;
    361362
    362363    if( !tr_bencDictFindList( args_in, "fields", &fields ) )
    363         return "no fields specified";
    364 
    365     for( i=0; i<torrentCount; ++i )
     364        msg = "no fields specified";
     365    else for( i=0; i<torrentCount; ++i )
    366366        addInfo( torrents[i], tr_bencListAdd( list ), fields );
    367367
    368368    tr_free( torrents );
    369     return NULL;
     369    return msg;
    370370}
    371371
Note: See TracChangeset for help on using the changeset viewer.