From: Jeriko One <jeriko.one@gmx.us>
Date: Mon, 20 Nov 2017 22:42:30 +0000 (-0800)
Subject: Ignore --protect-args when already sent by client
X-Git-Tag: v3.1.3pre1~3
X-Git-Url: http://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=7706303828fcde524222babb2833864a4bd09e07

Ignore --protect-args when already sent by client

In parse_arguments when --protect-args is encountered the function exits
early. The caller is expected to check protect_args, and recall
parse_arguments setting protect_args to 2. This patch prevents the
client from resetting protect_args during the second pass of
parse_arguments. This prevents parse_arguments returning early the
second time before it's able to sanitize the arguments it received.
---

diff --git a/options.c b/options.c
index 64ec8b84..cb94ef03 100644
--- a/options.c
+++ b/options.c
@@ -1313,6 +1313,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	const char *arg, **argv = *argv_p;
 	int argc = *argc_p;
 	int opt;
+	int orig_protect_args = protect_args;
 
 	if (ref && *ref)
 		set_refuse_options(ref);
@@ -1934,6 +1935,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (fuzzy_basis > 1)
 		fuzzy_basis = basis_dir_cnt + 1;
 
+	/* Don't let the client reset protect_args if it was already processed */
+	if (orig_protect_args == 2 && am_server)
+		protect_args = orig_protect_args;
+
 	if (protect_args == 1 && am_server)
 		return 1;