Merge pull request #177 from dbaarda/fix/netint1

Fix #176 rs_int_len() for large values.

2 files changed, 11 insertions, 5 deletions

diff --git a/NEWS.md b/NEWS.md
index 7197d0d..a6e9815 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 
 NOT RELEASED YET
 
+ * Fix #176 hangs calculating deltas for files larger than 4GB. (dbaarda,
+   https://github.com/librsync/librsync/pull/177)
+
 ## librsync 2.2.0
 
 Released 2019-10-12
diff --git a/src/netint.c b/src/netint.c
index 90f813f..ce45bc6 100644
--- a/src/netint.c
+++ b/src/netint.c
@@ -146,9 +146,12 @@ rs_result rs_suck_n4(rs_job_t *job, int *v)
 
 int rs_int_len(rs_long_t val)
 {
-    int i;
-
-    for (i = 8; val >> i; i *= 2) ;
-    assert(i <= 64);
-    return i / 8;
+    if (!(val & ~(rs_long_t)0xff))
+        return 1;
+    if (!(val & ~(rs_long_t)0xffff))
+	return 2;
+    if (!(val & ~(rs_long_t)0xffffffff))
+	return 4;
+    assert(!(val & ~(rs_long_t)0xffffffffffffffff));
+    return 8;
 }