Changeset 2348

Timestamp:

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

Author:

charles

Message:

fix crash on zero-byte torrents

Location:

trunk/libtransmission

Files:

• completion.c (modified) (5 diffs)
• fastresume.c (modified) (1 diff)
• inout.c (modified) (1 diff)
• utils.c (modified) (2 diffs)
• utils.h (modified) (1 diff)

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));
 

trunk/libtransmission/fastresume.c

@@ -301 +301 @@
                         file->name, file->firstPiece, file->lastPiece);
                 tr_bitfieldAddRange( uncheckedPieces, 
-                                     file->firstPiece, file->lastPiece );
+                                     file->firstPiece, file->lastPiece+1 );
             }
         }

trunk/libtransmission/inout.c

@@ -223 +223 @@
 
     if( (mode==TR_RECHECK_FORCE) || fastResumeLoad( tor, uncheckedPieces ) )
-        tr_bitfieldAddRange( uncheckedPieces, 0, tor->info.pieceCount-1 );
+        tr_bitfieldAddRange( uncheckedPieces, 0, tor->info.pieceCount );
 
     if( tr_bitfieldIsEmpty( uncheckedPieces ) ) {

trunk/libtransmission/utils.c

@@ -513 +513 @@
 void
 tr_bitfieldAddRange( tr_bitfield_t  * bitfield,
-                     size_t           first,
-                     size_t           last )
+                     size_t           begin,
+                     size_t           end )
 {
     /* TODO: there are faster ways to do this */
     unsigned int i;
-    for( i=first; i<=last; ++i )
+    for( i=begin; i<end; ++i )
         tr_bitfieldAdd( bitfield, i );
 }
@@ -535 +535 @@
 void
 tr_bitfieldRemRange ( tr_bitfield_t  * b,
-                      size_t           first,
-                      size_t           last )
+                      size_t           begin,
+                      size_t           end )
 {
     /* TODO: there are faster ways to do this */
     unsigned int i;
-    for( i=first; i<=last; ++i )
+    for( i=begin; i<end; ++i )
         tr_bitfieldRem( b, i );
 }

trunk/libtransmission/utils.h

@@ -190 +190 @@
 void tr_bitfieldAdd( tr_bitfield_t*, size_t bit );
 void tr_bitfieldRem( tr_bitfield_t*, size_t bit );
-void tr_bitfieldAddRange( tr_bitfield_t *, size_t first, size_t last );
-void tr_bitfieldRemRange ( tr_bitfield_t*, size_t first, size_t last );
+void tr_bitfieldAddRange( tr_bitfield_t *, size_t begin, size_t end );
+void tr_bitfieldRemRange ( tr_bitfield_t*, size_t begin, size_t end );
 
 int    tr_bitfieldIsEmpty( const tr_bitfield_t* );