From 77bdb6522d5f1e04ad8bdceb56b5967ff08f76f1 Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Thu, 17 Feb 2011 12:57:36 +0000
Subject: [PATCH] (trunk libT) #3767 "rarest first policy" -- possible fix for
 assertion error reported by rolcol

Resolve the problem described @ https://trac.transmissionbt.com/ticket/3767#comment:38
---
 libtransmission/peer-mgr.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 3f951acee..adf566f2c 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -1206,10 +1206,9 @@ tr_incrReplicationFromBitfield( Torrent * t, const tr_bitfield * b )
     assert( n == t->pieceReplicationSize );
     assert( tr_bitfieldTestFast( b, n-1 ) );
 
-    if( tr_bitfieldTestFast( b, n-1 ) )
-        for( i=0; i<n; ++i )
-            if( tr_bitfieldHasFast( b, i ) )
-                ++rep[i];
+    for( i=0; i<n; ++i )
+        if( tr_bitfieldHas( b, i ) )
+            ++rep[i];
 
     if( t->pieceSortState == PIECES_SORTED_BY_WEIGHT )
         invalidatePieceSorting( t );
@@ -1252,10 +1251,9 @@ tr_decrReplicationFromBitset( Torrent * t, const tr_bitset * bitset )
     {
         const tr_bitfield * const b = &bitset->bitfield;
 
-        if( tr_bitfieldTestFast( b, n-1 ) )
-            for( i=0; i<n; ++i )
-                if( tr_bitfieldHasFast( b, i ) )
-                    --t->pieceReplication[i];
+        for( i=0; i<n; ++i )
+            if( tr_bitfieldHas( b, i ) )
+                --t->pieceReplication[i];
 
         if( t->pieceSortState == PIECES_SORTED_BY_WEIGHT )
             invalidatePieceSorting( t );