Skip to content

L
liblongpath-rsync
Commit 67dde161 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

In read_sum_head: output the who_am_i() info in our error messages.

parent f1d5ba40
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
io.c
View file @ 67dde161
...@@ -786,19 +786,20 @@ void read_sum_head(int f, struct sum_struct *sum) ...@@ -786,19 +786,20 @@ void read_sum_head(int f, struct sum_struct *sum)
sum->count = read_int(f); sum->count = read_int(f);
sum->blength = read_int(f); sum->blength = read_int(f);
if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) { if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
rprintf(FERROR, "Invalid block length %ld\n", rprintf(FERROR, "[%s] Invalid block length %ld\n",
(long)sum->blength); who_am_i(), (long)sum->blength);
exit_cleanup(RERR_PROTOCOL); exit_cleanup(RERR_PROTOCOL);
} }
sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) { if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) {
rprintf(FERROR, "Invalid checksum length %d\n", sum->s2length); rprintf(FERROR, "[%s] Invalid checksum length %d\n",
who_am_i(), sum->s2length);
exit_cleanup(RERR_PROTOCOL); exit_cleanup(RERR_PROTOCOL);
} }
sum->remainder = read_int(f); sum->remainder = read_int(f);
if (sum->remainder < 0 || sum->remainder > sum->blength) { if (sum->remainder < 0 || sum->remainder > sum->blength) {
rprintf(FERROR, "Invalid remainder length %ld\n", rprintf(FERROR, "[%s] Invalid remainder length %ld\n",
(long)sum->remainder); who_am_i(), (long)sum->remainder);
exit_cleanup(RERR_PROTOCOL); exit_cleanup(RERR_PROTOCOL);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment