1 From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
2 From: Jeriko One <jeriko.one@gmx.us>
3 Date: Thu, 16 Nov 2017 17:05:42 -0800
4 Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
6 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
8 Patch status: upstream commit 70aeb5fddd
11 1 file changed, 6 insertions(+)
13 diff --git a/rsync.c b/rsync.c
14 index b82e59881018..a0945ba4e7f5 100644
17 @@ -49,6 +49,7 @@ extern int flist_eof;
18 extern int file_old_total;
19 extern int keep_dirlinks;
20 extern int make_backups;
21 +extern int sanitize_paths;
22 extern struct file_list *cur_flist, *first_flist, *dir_flist;
23 extern struct chmod_mode_struct *daemon_chmod_modes;
25 @@ -396,6 +397,11 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
26 if (iflags & ITEM_XNAME_FOLLOWS) {
27 if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
28 exit_cleanup(RERR_PROTOCOL);
30 + if (sanitize_paths) {
31 + sanitize_path(buf, buf, "", 0, SP_DEFAULT);