Fixed the multiplying of blength*blength so that it can't overflow

[rsync/rsync.git] / match.c

diff --git a/match.c b/match.c
index 292c537..95d84b9 100644 (file)
--- a/match.c
+++ b/match.c
@@ -19,12 +19,9 @@
 
 #include "rsync.h"
 
-extern int csum_length;
-
 extern int verbose;
 extern int am_server;
-
-extern int remote_version;
+extern int do_progress;
 
 typedef unsigned short tag;
 
@@ -131,7 +128,7 @@ static void matched(int f,struct sum_struct *s,struct map_struct *buf,
        else
                last_match = offset;
 
-       if (buf) {
+       if (buf && do_progress) {
                show_progress(last_match, buf->file_size);
 
                if (i == -1) end_progress(buf->file_size);
@@ -153,9 +150,12 @@ static void hash_search(int f,struct sum_struct *s,
        last_i = -1;
 
        if (verbose > 2)
-               rprintf(FINFO,"hash search b=%d len=%.0f\n",s->n,(double)len);
+               rprintf(FINFO,"hash search b=%ld len=%.0f\n",
+                       (long) s->blength, (double)len);
 
-       k = MIN(len, s->n);
+       /* cast is to make s->blength signed; it should always be reasonably
+        * small */
+       k = MIN(len, (OFF_T) s->blength);
        
        map = (schar *)map_ptr(buf,0,k);
        
@@ -170,8 +170,8 @@ static void hash_search(int f,struct sum_struct *s,
        end = len + 1 - s->sums[s->count-1].len;
        
        if (verbose > 3)
-               rprintf(FINFO,"hash search s->n=%d len=%.0f count=%d\n",
-                       s->n,(double)len,s->count);
+               rprintf(FINFO, "hash search s->blength=%ld len=%.0f count=%ld\n",
+                       (long) s->blength, (double) len, (long) s->count);
        
        do {
                tag t = gettag2(s1,s2);
@@ -193,7 +193,7 @@ static void hash_search(int f,struct sum_struct *s,
                        if (sum != s->sums[i].sum1) continue;
                        
                        /* also make sure the two blocks are the same length */
-                       l = MIN(s->n,len-offset);
+                       l = MIN(s->blength,len-offset);
                        if (l != s->sums[i].len) continue;                      
 
                        if (verbose > 3)
@@ -206,7 +206,7 @@ static void hash_search(int f,struct sum_struct *s,
                                done_csum2 = 1;
                        }
                        
-                       if (memcmp(sum2,s->sums[i].sum2,csum_length) != 0) {
+                       if (memcmp(sum2,s->sums[i].sum2,s->s2length) != 0) {
                                false_alarms++;
                                continue;
                        }
@@ -217,7 +217,7 @@ static void hash_search(int f,struct sum_struct *s,
                                int i2 = targets[j].i;
                                if (i2 == last_i + 1) {
                                        if (sum != s->sums[i2].sum1) break;
-                                       if (memcmp(sum2,s->sums[i2].sum2,csum_length) != 0) break;
+                                       if (memcmp(sum2,s->sums[i2].sum2,s->s2length) != 0) break;
                                        /* we've found an adjacent match - the RLL coder 
                                           will be happy */
                                        i = i2;
@@ -229,7 +229,7 @@ static void hash_search(int f,struct sum_struct *s,
                        
                        matched(f,s,buf,offset,i);
                        offset += s->sums[i].len - 1;
-                       k = MIN((len-offset), s->n);
+                       k = MIN((len-offset), s->blength);
                        map = (schar *)map_ptr(buf,offset,k);
                        sum = get_checksum1((char *)map, k);
                        s1 = sum & 0xFFFF;
@@ -259,9 +259,9 @@ static void hash_search(int f,struct sum_struct *s,
                   running match, the checksum update and the
                   literal send. */
                if (offset > last_match &&
-                   offset-last_match >= CHUNK_SIZE+s->n && 
+                   offset-last_match >= CHUNK_SIZE+s->blength && 
                    (end-offset > CHUNK_SIZE)) {
-                       matched(f,s,buf,offset - s->n, -2);
+                       matched(f,s,buf,offset - s->blength, -2);
                }
        } while (++offset < end);
        
@@ -319,13 +319,11 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 
        sum_end(file_sum);
 
-       if (remote_version >= 14) {
-               if (verbose > 2)
-                       rprintf(FINFO,"sending file_sum\n");
-               write_buf(f,file_sum,MD4_SUM_LENGTH);
-               if (write_batch) /* dw */
-                   write_batch_delta_file(file_sum, MD4_SUM_LENGTH);
-       }
+       if (verbose > 2)
+               rprintf(FINFO,"sending file_sum\n");
+       write_buf(f,file_sum,MD4_SUM_LENGTH);
+       if (write_batch) /* dw */
+               write_batch_delta_file(file_sum, MD4_SUM_LENGTH);
 
        if (targets) {
                free(targets);