Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If we're the server and --files-from is "-", set remote_filesfrom_file
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
f0dc1a1
..
7d7b586
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-42,10
+42,16
@@
void read_sum_head(int f, struct sum_struct *sum)
sum->count = read_int(f);
sum->blength = read_int(f);
sum->count = read_int(f);
sum->blength = read_int(f);
- if (protocol_version < 27)
+ if (protocol_version < 27)
{
sum->s2length = csum_length;
sum->s2length = csum_length;
- else
+ } else {
sum->s2length = read_int(f);
sum->s2length = read_int(f);
+ if (sum->s2length > MD4_SUM_LENGTH) {
+ rprintf(FERROR, "Invalid checksum length %d\n",
+ sum->s2length);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ }
sum->remainder = read_int(f);
}
sum->remainder = read_int(f);
}
@@
-58,7
+64,7
@@
static struct sum_struct *receive_sums(int f)
int i;
OFF_T offset = 0;
int i;
OFF_T offset = 0;
- s =
(struct sum_struct *)malloc(sizeof(*s)
);
+ s =
new(struct sum_struct
);
if (!s) out_of_memory("receive_sums");
read_sum_head(f, s);
if (!s) out_of_memory("receive_sums");
read_sum_head(f, s);
@@
-73,7
+79,7
@@
static struct sum_struct *receive_sums(int f)
if (s->count == 0)
return(s);
if (s->count == 0)
return(s);
- s->sums =
(struct sum_buf *)malloc(sizeof(s->sums[0])*
s->count);
+ s->sums =
new_array(struct sum_buf,
s->count);
if (!s->sums) out_of_memory("receive_sums");
for (i = 0; i < (int) s->count; i++) {
if (!s->sums) out_of_memory("receive_sums");
for (i = 0; i < (int) s->count; i++) {
@@
-158,7
+164,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (strlen(fname) == MAXPATHLEN-1) {
io_error = 1;
rprintf(FERROR, "send_files failed on long-named directory %s\n",
if (strlen(fname) == MAXPATHLEN-1) {
io_error = 1;
rprintf(FERROR, "send_files failed on long-named directory %s\n",
- f
name
);
+ f
ull_fname(fname)
);
return;
}
strlcat(fname, "/", MAXPATHLEN);
return;
}
strlcat(fname, "/", MAXPATHLEN);
@@
-194,7
+200,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (fd == -1) {
io_error = 1;
rprintf(FERROR, "send_files failed to open %s: %s\n",
if (fd == -1) {
io_error = 1;
rprintf(FERROR, "send_files failed to open %s: %s\n",
- f
name
, strerror(errno));
+ f
ull_fname(fname)
, strerror(errno));
free_sums(s);
continue;
}
free_sums(s);
continue;
}
@@
-202,7
+208,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error = 1;
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error = 1;
- rprintf(FERROR, "fstat failed
: %s\n", strerror(errno));
+ rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
free_sums(s);
close(fd);
return;
free_sums(s);
close(fd);
return;
@@
-277,7
+283,17
@@
void send_files(struct file_list *flist, int f_out, int f_in)
}
if (!read_batch) { /* dw */
}
if (!read_batch) { /* dw */
- if (buf) unmap_file(buf);
+ if (buf) {
+ j = unmap_file(buf);
+ if (j) {
+ io_error = 1;
+ rprintf(FERROR,
+ "read errors mapping %s: (%d) %s\n",
+ full_fname(fname),
+ j,
+ strerror(j));
+ }
+ }
close(fd);
}
close(fd);
}