summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeriko One <jeriko.one@gmx.us>2017-11-16 17:05:42 -0800
committerWayne Davison <wayned@samba.org>2017-12-03 16:13:05 -0800
commit70aeb5fddd1b2f8e143276f8d5a085db16c593b9 (patch)
tree3f79fc427790bf4d4d81ee1edc7702e2c9c651a3
parent3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 (diff)
downloadrsync-70aeb5fddd1b2f8e143276f8d5a085db16c593b9.tar.gz
Sanitize xname in read_ndx_and_attrs.
-rw-r--r--rsync.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/rsync.c b/rsync.c
index b82e5988..a0945ba4 100644
--- a/rsync.c
+++ b/rsync.c
@@ -49,6 +49,7 @@ extern int flist_eof;
extern int file_old_total;
extern int keep_dirlinks;
extern int make_backups;
+extern int sanitize_paths;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
#ifdef ICONV_OPTION
@@ -396,6 +397,11 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
if (iflags & ITEM_XNAME_FOLLOWS) {
if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
exit_cleanup(RERR_PROTOCOL);
+
+ if (sanitize_paths) {
+ sanitize_path(buf, buf, "", 0, SP_DEFAULT);
+ len = strlen(buf);
+ }
} else {
*buf = '\0';
len = -1;