Changeset 3568 for trunk/libtransmission/fastresume.c

Timestamp:

Oct 26, 2007, 1:13:43 AM (15 years ago)

Author:

charles

Message:

Fix 0.90 cache bug that could cause "verify local files" to fail.

File:

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

trunk/libtransmission/fastresume.c

@@ -440 +440 @@
                         FILE              * file )
 {
-    int i;
     const size_t len = FR_PROGRESS_LEN( tor );
     uint8_t * buf = calloc( len, 1 );
-    uint8_t * walk = buf;
-
-    if( len != fread( buf, 1, len, file ) ) {
+    int ret = 0;
+    int i;
+
+    if( len != fread( buf, 1, len, file ) )
+    {
         tr_inf( "Couldn't read from resume file" );
-        free( buf );
-        return TR_ERROR_IO_OTHER;
-    }
-
-    /* compare file mtimes */
-    if (1) {
+        tr_bitfieldAddRange( uncheckedPieces, 0, tor->info.pieceCount );
+        ret = TR_ERROR_IO_OTHER;
+    }
+    else
+    {
         int n;
+        tr_bitfield bitfield;
+
+        /* compare file mtimes */
         tr_time_t * curMTimes = getMTimes( tor, &n );
+        uint8_t * walk = buf;
         const tr_time_t * oldMTimes = (const tr_time_t *) walk;
         for( i=0; i<n; ++i ) {
-            if ( curMTimes[i]!=oldMTimes[i] ) {
+            if ( !curMTimes[i] || ( curMTimes[i] != oldMTimes[i] ) ) {
                 const tr_file * file = &tor->info.files[i];
                 tr_dbg( "File '%s' mtimes differ-- flagging pieces [%d..%d] for recheck",
@@ -467 +471 @@
         free( curMTimes );
         walk += n * sizeof(tr_time_t);
-    }
-
-    /* get the completion bitfield */
-    if (1) {
-        tr_bitfield bitfield;
+
+        /* get the completion bitfield */
         memset( &bitfield, 0, sizeof bitfield );
         bitfield.len = FR_BLOCK_BITFIELD_LEN( tor );
@@ -486 +487 @@
 
     free( buf );
-    return TR_OK;
+    return ret;
 }