Changeset 4213

Timestamp:

Dec 19, 2007, 5:57:55 AM (14 years ago)

Author:

charles

Message:

fix an obscure bug in tr_torrentStat() where (% verified + % unverified + % unavailable) could be > 1.0

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (2 diffs)
• utils.c (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -791 +791 @@
     {
         int i;
-        tr_bitfield * available = tr_peerMgrGetAvailable( tor->handle->peerMgr,
-                                                          tor->info.hash );
+        tr_bitfield * availablePieces = tr_peerMgrGetAvailable( tor->handle->peerMgr,
+                                                                tor->info.hash );
         s->desiredSize = 0;
         s->desiredAvailable = 0;
@@ -798 +798 @@
         for( i=0; i<tor->info.pieceCount; ++i ) {
             if( !tor->info.pieces[i].dnd ) {
-                s->desiredSize += tr_torPieceCountBytes( tor, i );
-                if( tr_bitfieldHas( available, i ) )
-                    s->desiredAvailable += tr_torPieceCountBytes( tor, i );
+                const uint64_t byteCount = tr_torPieceCountBytes( tor, i );
+                s->desiredSize += byteCount;
+                if( tr_bitfieldHas( availablePieces, i ) )
+                    s->desiredAvailable += byteCount;
             }
         }
 
-        tr_bitfieldFree( available );
+        /* "availablePieces" can miss our unverified blocks... */
+        if( s->desiredAvailable < s->haveValid + s->haveUnchecked )
+            s->desiredAvailable = s->haveValid + s->haveUnchecked;
+
+        tr_bitfieldFree( availablePieces );
     }
    

trunk/libtransmission/utils.c

@@ -699 +699 @@
     assert( a->len == b->len );
 
-    for( ait=a->bits, bit=b->bits, aend=ait+a->len; ait!=aend; ++ait, ++bit )
-        *ait |= *bit;
+    for( ait=a->bits, bit=b->bits, aend=ait+a->len; ait!=aend; )
+        *ait++ |= *bit++;
 
     return a;