X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a3a48ced1a2daac7d94908c61259d591338cb371..934dbf050b7f8043eab8f0f04365f18a6b9055f3:/cmdline.c

diff --git a/cmdline.c b/cmdline.c
index 3e890b78..033df64a 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -315,7 +315,19 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     if (!strcmp(p, "-pw")) {
 	RETURN(2);
 	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
-	cmdline_password = value;
+	SAVEABLE(1);
+	/* We delay evaluating this until after the protocol is decided,
+	 * so that we can warn if it's of no use with the selected protocol */
+	if (cfg->protocol != PROT_SSH)
+	    cmdline_error("the -pw option can only be used with the "
+			  "SSH protocol");
+	else {
+	    cmdline_password = dupstr(value);
+	    /* Assuming that `value' is directly from argv, make a good faith
+	     * attempt to trample it, to stop it showing up in `ps' output
+	     * on Unix-like systems. Not guaranteed, of course. */
+	    memset(value, 0, strlen(value));
+	}
     }
 
     if (!strcmp(p, "-agent") || !strcmp(p, "-pagent") ||