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
Added missing call to safe_fname().
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
d25b1b1
..
6cc8840
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-278,7
+278,7
@@
static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
}
if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
rprintf(FERROR, "merge-file name overflows: %s\n",
}
if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
rprintf(FERROR, "merge-file name overflows: %s\n",
-
merge_file
);
+
safe_fname(merge_file)
);
return NULL;
}
} else {
return NULL;
}
} else {
@@
-291,7
+291,8
@@
static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
goto done;
if (dirbuf_len + fn_len >= MAXPATHLEN) {
goto done;
if (dirbuf_len + fn_len >= MAXPATHLEN) {
- rprintf(FERROR, "merge-file name overflows: %s\n", fn);
+ rprintf(FERROR, "merge-file name overflows: %s\n",
+ safe_fname(fn));
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);