Changeset 1599

Timestamp:

28/04/2007 21:42:45 (21 months ago)

Author:

chris

Message:

Fix bbackupd choosing an invalid (too large) block size for large files
(over 2GB) which will cause compare to fail: when rBlockSizeOut ==
BACKUP_FILE_MAX_BLOCK_SIZE we would have proceeded around the loop one
more time and doubled the block size again. (refs #2, refs #3)

Files:

• box/chris/merge/lib/backupclient/BackupStoreFileEncodeStream.cpp (modified) (1 diff)

box/chris/merge/lib/backupclient/BackupStoreFileEncodeStream.cpp

@@ -279 +279 @@
                 rNumBlocksOut = (DataSize + rBlockSizeOut - 1) / rBlockSizeOut;
                 
-        } while(rBlockSizeOut <= BACKUP_FILE_MAX_BLOCK_SIZE && rNumBlocksOut > BACKUP_FILE_INCREASE_BLOCK_SIZE_AFTER);
+        } while(rBlockSizeOut < BACKUP_FILE_MAX_BLOCK_SIZE && rNumBlocksOut > BACKUP_FILE_INCREASE_BLOCK_SIZE_AFTER);
         
         // Last block size