Changeset 1534 for trunk/libtransmission/peerutils.h

Timestamp:

Mar 5, 2007, 11:03:38 PM (15 years ago)

Author:

joshe

Message:

Do bounds checking on bitfields.

File:

• trunk/libtransmission/peerutils.h (modified) (3 diffs)

trunk/libtransmission/peerutils.h

@@ -105 +105 @@
 static int isInteresting( tr_torrent_t * tor, tr_peer_t * peer )
 {
-    tr_info_t * inf = &tor->info;
-
-    int i;
-    int bitfieldSize = ( inf->pieceCount + 7 ) / 8;
-    uint8_t * bitfield = tr_cpPieceBitfield( tor->completion );
+    int ii;
+    tr_bitfield_t * bitfield = tr_cpPieceBitfield( tor->completion );
 
     if( !peer->bitfield )
@@ -117 +114 @@
     }
 
-    for( i = 0; i < bitfieldSize; i++ )
-    {
-        if( ( peer->bitfield[i] & ~(bitfield[i]) ) & 0xFF )
+    assert( bitfield->len == peer->bitfield->len );
+    for( ii = 0; ii < bitfield->len; ii++ )
+    {
+        if( ( peer->bitfield->bits[ii] & ~(bitfield->bits[ii]) ) & 0xFF )
         {
             return 1;
@@ -198 +196 @@
         /* All pieces in 'pool' have 'minMissing' missing blocks. Find
            the rarest ones. */
-        uint8_t * bitfield;
+        tr_bitfield_t * bitfield;
         int piece;
         int min, foo, j;