Changeset 2872

Timestamp:

Aug 19, 2007, 4:03:06 AM (15 years ago)

Author:

charles

Message:

better fix for the leak in r2870

File:

• trunk/libtransmission/torrent.c (modified) (6 diffs)

trunk/libtransmission/torrent.c

@@ -406 +406 @@
                  tr_info_t          * setme_info )
 {
-    int ret;
+    int ret, doFree;
     tr_info_t tmp;
 
@@ -414 +414 @@
     memset( setme_info, 0, sizeof( tr_info_t ) );
     ret = tr_metainfoParseFile( setme_info, h->tag, path, FALSE );
+    doFree = !ret && (setme_info == &tmp);
 
     if( ret == TR_OK )
         ret = infoCanAdd( h, destination, setme_info );
 
-    if( setme_info == &tmp )
+    if( doFree )
         tr_metainfoFree( &tmp );
 
@@ -456 +457 @@
                      tr_info_t          * setme_info )
 {
-    int ret;
+    int ret, doFree;
     tr_info_t tmp;
 
@@ -464 +465 @@
     memset( setme_info, 0, sizeof( tr_info_t ) );
     ret = tr_metainfoParseHash( setme_info, h->tag, hashStr );
+    doFree = !ret && (setme_info == &tmp);
 
     if( ret == TR_OK )
         ret = infoCanAdd( h, destination, setme_info );
 
-    if( setme_info == &tmp )
+    if( doFree )
         tr_metainfoFree( &tmp );
 
@@ -507 +509 @@
                      tr_info_t          * setme_info )
 {
-    int ret;
+    int ret, doFree;
     tr_info_t tmp;
 
@@ -515 +517 @@
     memset( setme_info, 0, sizeof( tr_info_t ) );
     ret = tr_metainfoParseData( setme_info, h->tag, data, size, FALSE );
+    doFree = !ret && (setme_info == &tmp);
 
     if( ret == TR_OK )
         ret = infoCanAdd( h, destination, setme_info );
 
-    if( setme_info == &tmp )
+    if( doFree )
         tr_metainfoFree( &tmp );