Changeset 1534 for trunk/libtransmission/peerparse.h

Timestamp:

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

Author:

joshe

Message:

Do bounds checking on bitfields.

File:

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

trunk/libtransmission/peerparse.h

@@ -105 +105 @@
     if( !peer->bitfield )
     {
-        peer->bitfield = calloc( ( tor->info.pieceCount + 7 ) / 8, 1 );
+        peer->bitfield = tr_bitfieldNew( tor->info.pieceCount );
     }
     if( !tr_bitfieldHas( peer->bitfield, piece ) )
@@ -155 +155 @@
     if( !peer->bitfield )
     {
-        peer->bitfield = malloc( bitfieldSize );
-    }
-    memcpy( peer->bitfield, p, bitfieldSize );
+        peer->bitfield = tr_bitfieldNew( inf->pieceCount );
+    }
+    assert( bitfieldSize == peer->bitfield->len );
+    memcpy( peer->bitfield->bits, p, bitfieldSize );
 
     peer->pieceCount = 0;
@@ -295 +296 @@
     if( !peer->blamefield )
     {
-        peer->blamefield = calloc( ( tor->info.pieceCount + 7 ) / 8, 1 );
+        peer->blamefield = tr_bitfieldNew( tor->info.pieceCount );
     }
     tr_bitfieldAdd( peer->blamefield, index );