Changeset 12921

Timestamp:

Sep 26, 2011, 10:50:42 PM (11 years ago)

Author:

jordan

Message:

(trunk libt) in tr_bitfieldSetRaw(), add a `bounded' argument for cases where we know how large the final bitfield will be. This can be used ensure that the excess bits at the end of the array are zeroed out and safe for bitfield.c's countArray() function.

Location:

trunk/libtransmission

Files:

• bitfield.c (modified) (1 diff)
• bitfield.h (modified) (1 diff)
• peer-msgs.c (modified) (1 diff)
• resume.c (modified) (2 diffs)

trunk/libtransmission/bitfield.c

@@ -282 +282 @@
         tr_bitfieldSetHasNone( b );
     else
-        tr_bitfieldSetRaw( b, src->bits, src->alloc_count );
-}
-
-void
-tr_bitfieldSetRaw( tr_bitfield * b, const void * bits, size_t byte_count )
+        tr_bitfieldSetRaw( b, src->bits, src->alloc_count, true );
+}
+
+void
+tr_bitfieldSetRaw( tr_bitfield * b, const void * bits, size_t byte_count, bool bounded )
 {
     tr_bitfieldFreeArray( b );
     b->true_count = 0;
+
+    if( bounded )
+        byte_count = MIN( byte_count, get_bytes_needed( b->bit_count ) );
+
     b->bits = tr_memdup( bits, byte_count );
     b->alloc_count = byte_count;
+
+    if( bounded ) {
+        /* ensure the excess bits are set to '0' */
+        const int excess_bit_count = byte_count*8 - b->bit_count;
+        assert( excess_bit_count >= 0 );
+        assert( excess_bit_count <= 7 );
+        if( excess_bit_count )
+            b->bits[b->alloc_count-1] &= ((0xff) << excess_bit_count);
+    }
+
     tr_bitfieldRebuildTrueCount( b );
 }

trunk/libtransmission/bitfield.h

@@ -75 +75 @@
 void   tr_bitfieldSetFromBitfield( tr_bitfield*, const tr_bitfield* );
 
-void   tr_bitfieldSetRaw( tr_bitfield*, const void * bits, size_t byte_count );
+void   tr_bitfieldSetRaw( tr_bitfield*, const void * bits, size_t byte_count, bool bounded );
 
 void*  tr_bitfieldGetRaw( const tr_bitfield * b, size_t * byte_count );

trunk/libtransmission/peer-msgs.c

@@ -1415 +1415 @@
             dbgmsg( msgs, "got a bitfield" );
             tr_peerIoReadBytes( msgs->peer->io, inbuf, tmp, msglen );
-            tr_bitfieldSetRaw( &msgs->peer->have, tmp, msglen );
+            tr_bitfieldSetRaw( &msgs->peer->have, tmp, msglen, tr_torrentHasMetadata( msgs->torrent ) );
             fireClientGotBitfield( msgs, &msgs->peer->have );
             updatePeerProgress( msgs );

trunk/libtransmission/resume.c

@@ -592 +592 @@
                 tr_bitfieldSetHasNone( &blocks );
             else
-                tr_bitfieldSetRaw( &blocks, buf, buflen );
+                tr_bitfieldSetRaw( &blocks, buf, buflen, true );
         }
         else if( tr_bencDictFindStr( prog, KEY_PROGRESS_HAVE, &str ) )
@@ -603 +603 @@
         else if( tr_bencDictFindRaw( prog, KEY_PROGRESS_BITFIELD, &raw, &rawlen ) )
         {
-            tr_bitfieldSetRaw( &blocks, raw, rawlen );
+            tr_bitfieldSetRaw( &blocks, raw, rawlen, true );
         }
         else err = "Couldn't find 'pieces' or 'have' or 'bitfield'";