[Unison-hackers] [unison-svn] r409 - trunk/src

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2010-02-17 07:27:50 -0500 (Wed, 17 Feb 2010)
New Revision: 409

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/transfer.ml
Log:
* Mac OS: fixed rsync bug which could result in an "index out of bounds"
  error when transferring resource forks.


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2010-01-22 12:50:07 UTC (rev 408)
+++ trunk/src/RECENTNEWS	2010-02-17 12:27:50 UTC (rev 409)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.39.12
+
+* Mac OS: fixed rsync bug which could result in an "index out of bounds"
+  error when transferring resource forks.
+
+-------------------------------
 CHANGES FROM VERSION 2.39.6
 
 * Fixed "assertion failed" error introduced in last commit...

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2010-01-22 12:50:07 UTC (rev 408)
+++ trunk/src/mkProjectInfo.ml	2010-02-17 12:27:50 UTC (rev 409)
@@ -100,3 +100,4 @@
 
 
 
+

Modified: trunk/src/transfer.ml
===================================================================
--- trunk/src/transfer.ml	2010-01-22 12:50:07 UTC (rev 408)
+++ trunk/src/transfer.ml	2010-02-17 12:27:50 UTC (rev 409)
@@ -391,9 +391,10 @@
     (* Make sure we are at the beginning of the file
        (important for AppleDouble files *)
     LargeFile.seek_in infd 0L;
-    (* Limit the number of block so that there is no overflow in
-       encodeInt3 *)
-    let count = blockIter infd addBlock blockSize (256*256*256) in
+    let count =
+      (* Limit the number of blocks so that there is no overflow in
+         encodeInt3 *)
+      blockIter infd addBlock blockSize (min blockCount (256*256*256)) in
     debugLog (fun() -> Util.msg "%d blocks\n" count);
     Trace.showTimer timer;
     ({ blockSize = blockSize; blockCount = count; checksumSize = csSize;