[Box Backup-commit] COMMIT r1599 - box/chris/merge/lib/backupclient

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Sat Apr 28 21:42:45 BST 2007


Author: chris
Date: 2007-04-28 21:42:45 +0100 (Sat, 28 Apr 2007)
New Revision: 1599

Modified:
   box/chris/merge/lib/backupclient/BackupStoreFileEncodeStream.cpp
Log:
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)


Modified: box/chris/merge/lib/backupclient/BackupStoreFileEncodeStream.cpp
===================================================================
--- box/chris/merge/lib/backupclient/BackupStoreFileEncodeStream.cpp	2007-04-28 19:57:24 UTC (rev 1598)
+++ box/chris/merge/lib/backupclient/BackupStoreFileEncodeStream.cpp	2007-04-28 20:42:45 UTC (rev 1599)
@@ -278,7 +278,7 @@
 		
 		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
 	rLastBlockSizeOut = DataSize - ((rNumBlocksOut - 1) * rBlockSizeOut);




More information about the Boxbackup-commit mailing list