Changeset 9700

Timestamp:

Dec 10, 2009, 4:54:48 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #2655: "1.80b1 crash in peer-mgr.c's getPeersToClose()" -- fixed

File:

• trunk/libtransmission/bitfield.c (modified) (2 diffs)

trunk/libtransmission/bitfield.c

@@ -160 +160 @@
 
 tr_bitfield*
-tr_bitfieldOr( tr_bitfield *       a,
-               const tr_bitfield * b )
-{
-    uint8_t * ait;
-    const uint8_t *aend, *bit, *bend;
-
-    for( ait = a->bits, aend = ait + a->byteCount,
-         bit = b->bits, bend = bit + b->byteCount;
-         ait != aend && bit != bend; )
-    {
+tr_bitfieldOr( tr_bitfield * a, const tr_bitfield * b )
+{
+    uint8_t * ait = a->bits;
+    const uint8_t * aend = ait + a->byteCount;
+    const uint8_t * bit = b->bits;
+    const uint8_t * bend = bit + b->byteCount;
+
+    while( ait!=aend && bit!=bend )
         *ait++ |= *bit++;
-    }
 
     return a;
@@ -178 +175 @@
 /* set 'a' to all the flags that were in 'a' but not 'b' */
 void
-tr_bitfieldDifference( tr_bitfield *       a,
-                       const tr_bitfield * b )
-{
-    uint8_t *      ait;
-    const uint8_t *aend, *bit;
-
-    assert( a->byteCount == b->byteCount );
-
-    for( ait = a->bits, bit = b->bits, aend = ait + a->byteCount;
-         ait != aend; )
+tr_bitfieldDifference( tr_bitfield * a, const tr_bitfield * b )
+{
+    uint8_t * ait = a->bits;
+    const uint8_t * aend = ait + a->byteCount;
+    const uint8_t * bit = b->bits;
+    const uint8_t * bend = bit + b->byteCount;
+
+    while( ait!=aend && bit!=bend )
         *ait++ &= ~( *bit++ );
 }