Changeset 2348 for trunk/libtransmission/completion.c

Timestamp:

Jul 15, 2007, 3:52:51 AM (16 years ago)

Author:

charles

Message:

fix crash on zero-byte torrents

File:

• trunk/libtransmission/completion.c (modified) (5 diffs)

trunk/libtransmission/completion.c

@@ -116 +116 @@
 
     cp->completeBlocks[piece] = n_blocks;
-    tr_bitfieldAddRange( cp->blockBitfield, startBlock, endBlock-1 );
+    tr_bitfieldAddRange( cp->blockBitfield, startBlock, endBlock );
     tr_bitfieldAdd( cp->pieceBitfield, piece );
 }
@@ -128 +128 @@
 
     cp->completeBlocks[piece] = 0;
-    tr_bitfieldRemRange ( cp->blockBitfield, startBlock, endBlock-1 );
+    tr_bitfieldRemRange ( cp->blockBitfield, startBlock, endBlock );
     tr_bitfieldRem( cp->pieceBitfield, piece );
 }
@@ -323 +323 @@
     b *= tor->blockSize;
 
-    if( !tr_cpBlockIsComplete( cp, tor->blockCount - 1 ) )
-        b -= (tor->blockSize - (tor->info.totalSize % tor->blockSize));
+    if( tor->blockCount && !tr_cpBlockIsComplete( cp, tor->blockCount - 1 ) )
+          b -= (tor->blockSize - (tor->info.totalSize % tor->blockSize));
 
     return b;
@@ -349 +349 @@
     b *= tor->blockSize;
 
-    i = tor->blockCount - 1;
-    if( !tr_cpBlockIsComplete( cp, tor->blockCount-1 ) && !info->pieces[info->pieceCount-1].dnd )
-        b -= (tor->blockSize - (tor->info.totalSize % tor->blockSize));
+    if( tor->blockCount && !tr_cpBlockIsComplete( cp, tor->blockCount-1 )
+                        && !info->pieces[info->pieceCount-1].dnd )
+          b -= (tor->blockSize - (tor->info.totalSize % tor->blockSize));
 
     return b;
@@ -381 +381 @@
     uint64_t b = tr_bitfieldCountTrueBits( cp->blockBitfield ) * tor->blockSize;
 
-    if( tr_bitfieldHas( cp->blockBitfield, tor->blockCount - 1 ) )
+    if( tor->blockCount && tr_bitfieldHas( cp->blockBitfield, tor->blockCount - 1 ) )
         b -= (tor->blockSize - (tor->info.totalSize % tor->blockSize));