Changeset 2070

Timestamp:

Jun 13, 2007, 7:53:10 PM (15 years ago)

Author:

charles

Message:

fix off-by-one crasher reported by floam

File:

• branches/file_selection/libtransmission/torrent.c (modified) (2 diffs)

branches/file_selection/libtransmission/torrent.c

@@ -604 +604 @@
 {
     const tr_file_t * file = &tor->info.files[fileIndex];
-    int firstBlock         =  file->offset                 / tor->blockSize;
-    int firstBlockOffset   =  file->offset                 % tor->blockSize;
-    int lastBlock          = (file->offset + file->length) / tor->blockSize;
-    int lastBlockOffset    = (file->offset + file->length) % tor->blockSize;
+    int firstBlock         =  file->offset                     / tor->blockSize;
+    int firstBlockOffset   =  file->offset                     % tor->blockSize;
+    int lastBlock          = (file->offset + file->length - 1) / tor->blockSize;
+    int lastBlockOffset    = (file->offset + file->length - 1) % tor->blockSize;
     size_t haveBytes = 0;
 
+    assert( tor != NULL );
+    assert( 0<=fileIndex && fileIndex<tor->info.fileCount );
+    assert( file->offset + file->length <= tor->info.totalSize );
+    assert( 0<=firstBlock && firstBlock<tor->blockCount );
+    assert( 0<=lastBlock && lastBlock<tor->blockCount );
+    assert( firstBlock <= lastBlock );
     assert( tr_blockPiece( firstBlock ) == file->firstPiece );
     assert( tr_blockPiece( lastBlock ) == file->lastPiece );
@@ -1068 +1074 @@
     file = &info->files[fileIndex];
     firstByte = file->offset;
-    lastByte = firstByte + file->length;
+    lastByte = firstByte + file->length - 1;
     file->firstPiece = getBytePiece( info, firstByte );
     file->lastPiece = getBytePiece( info, lastByte );