Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b22184
)
Avoid a crash with --append-verify when discarding the received data.
author
Wayne Davison
<wayned@samba.org>
Sat, 21 Aug 2010 21:25:48 +0000
(14:25 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sat, 21 Aug 2010 21:25:48 +0000
(14:25 -0700)
Fixes bug 6293.
receiver.c
patch
|
blob
|
blame
|
history
diff --git
a/receiver.c
b/receiver.c
index
861895e
..
d5a338c
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-228,7
+228,7
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
sum.flength = (OFF_T)sum.count * sum.blength;
if (sum.remainder)
sum.flength -= sum.blength - sum.remainder;
sum.flength = (OFF_T)sum.count * sum.blength;
if (sum.remainder)
sum.flength -= sum.blength - sum.remainder;
- if (append_mode == 2) {
+ if (append_mode == 2
&& mapbuf
) {
for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
if (INFO_GTE(PROGRESS, 1))
show_progress(offset, total_size);
for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
if (INFO_GTE(PROGRESS, 1))
show_progress(offset, total_size);