Changeset 3572 for trunk/libtransmission/fastresume.c

Timestamp:

Oct 26, 2007, 3:02:23 AM (15 years ago)

Author:

charles

Message:

Quick & dirty fix to crasher ticket #415.

File:

• trunk/libtransmission/fastresume.c (modified) (5 diffs)

trunk/libtransmission/fastresume.c

@@ -331 +331 @@
 
 static int
-loadFallbackDestination( tr_torrent * tor, FILE * fp )
+loadDestination( tr_torrent * tor, FILE * fp, const char * destination, int argIsFallback )
 {
     int pathlen = 0;
     char path[MAX_PATH_LENGTH];
-    const int haveDestination = tor->destination && *tor->destination;
 
     for( ;; ) {
@@ -348 +347 @@
     path[pathlen] = '\0';
 
-    if( pathlen && !haveDestination ) {
-        tr_free( tor->destination );
-        tor->destination = tr_strdup( path );
-    }
+    if( argIsFallback )
+        tor->destination = tr_strdup( pathlen ? path : destination );
+    else
+        tor->destination = tr_strdup( destination && *destination ? destination : path );
 
     return TR_OK;
@@ -526 +525 @@
 static uint64_t
 fastResumeLoadImpl ( tr_torrent   * tor,
-                     tr_bitfield  * uncheckedPieces )
+                     tr_bitfield  * uncheckedPieces,
+                     const char   * destination,
+                     int            argIsFallback )
 {
     char      path[MAX_PATH_LENGTH];
@@ -630 +631 @@
             case FR_ID_DESTINATION:
                 {
-                    const int rret = loadFallbackDestination( tor, file );
+                    const int rret = loadDestination( tor, file, destination, argIsFallback );
 
                     if( rret && ( feof(file) || ferror(file) ) )
@@ -773 +774 @@
 uint64_t
 tr_fastResumeLoad( tr_torrent   * tor,
-                   tr_bitfield  * uncheckedPieces )
-{
-    const uint64_t ret = fastResumeLoadImpl( tor, uncheckedPieces );
+                   tr_bitfield  * uncheckedPieces,
+                   const char   * destination,
+                   int            argIsFallback )
+{
+    const uint64_t ret = fastResumeLoadImpl( tor, uncheckedPieces, destination, argIsFallback );
 
     if( ! ( ret & TR_FR_PROGRESS ) )
         tr_bitfieldAddRange( uncheckedPieces, 0, tor->info.pieceCount );
 
+    if( !tor->destination )
+        tor->destination = tr_strdup( destination );
+
     return ret;
 }