From 7aa58580f330edd299562df9fc50b0029dc267f2 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 14 May 2009 17:18:17 +0000
Subject: [PATCH] (trunk) fix a couple of memory leaks.

---
 gtk/tr-core.c                | 16 +++++++++-------
 libtransmission/rpc-server.c |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index c27f49ab9..ff6a29c07 100644
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -519,15 +519,18 @@ scanWatchDir( TrCore * core )
 
     if( isEnabled )
     {
-        const char * dirname = pref_string_get( PREF_KEY_DIR_WATCH );
-        GDir *       dir = g_dir_open( dirname, 0, NULL );
         const char * basename;
-        while( ( basename = g_dir_read_name( dir ) ) )
+        const char * dirname = pref_string_get( PREF_KEY_DIR_WATCH );
+        GDir * dir = g_dir_open( dirname, 0, NULL );
+
+        while(( basename = g_dir_read_name( dir )))
         {
             char * filename = g_build_filename( dirname, basename, NULL );
             maybeAddTorrent( core, filename );
             g_free( filename );
         }
+
+        g_dir_close( dir );
     }
 }
 
@@ -859,16 +862,13 @@ add_filename( TrCore *     core,
 
     if( filename && session )
     {
-        tr_ctor * ctor;
-
-        ctor = tr_ctorNew( session );
+        tr_ctor * ctor = tr_ctorNew( session );
         tr_core_apply_defaults( ctor );
         tr_ctorSetPaused( ctor, TR_FORCE, !doStart );
 
         if( tr_ctorSetMetainfoFromFile( ctor, filename ) )
         {
             tr_core_errsig( core, TR_EINVALID, filename );
-            tr_ctorFree( ctor );
         }
         else
         {
@@ -904,6 +904,8 @@ add_filename( TrCore *     core,
                     break;
             }
         }
+
+        tr_ctorFree( ctor );
     }
 }
 
diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index d4bc9a6e6..cf5fb64b5 100644
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -818,6 +818,7 @@ closeServer( void * vserver )
 #ifdef HAVE_ZLIB
     deflateEnd( &s->stream );
 #endif
+    tr_free( s->sessionId );
     tr_free( s->whitelistStr );
     tr_free( s->username );
     tr_free( s->password );
-- 
2.40.0