X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/01ccff1bf84e2f507e7c144f97413b0b4add5b35..60860bc3697233687834d4efd4f1fe616f2fb9fb:/cmdline.c

diff --git a/cmdline.c b/cmdline.c
index bdfa1aa2..183797df 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -263,8 +263,8 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 	    unsigned len = portp - host;
 	    if (len >= sizeof(cfg->ssh_nc_host))
 		len = sizeof(cfg->ssh_nc_host) - 1;
-	    strncpy(cfg->ssh_nc_host, value, len);
-	    cfg->ssh_nc_host[sizeof(cfg->ssh_nc_host) - 1] = '\0';
+	    memcpy(cfg->ssh_nc_host, value, len);
+	    cfg->ssh_nc_host[len] = '\0';
 	    cfg->ssh_nc_port = atoi(portp+1);
 	} else {
 	    cmdline_error("-nc expects argument of form 'host:port'");
@@ -319,10 +319,15 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 	/* 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 "
+	    cmdline_error("the -pw option can only be used with the "
 			  "SSH protocol");
-	else
-	    cmdline_password = value;
+	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") ||
@@ -369,13 +374,13 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     if (!strcmp(p, "-t")) {
 	RETURN(1);
 	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
-	SAVEABLE(0);
+	SAVEABLE(1);	/* lower priority than -m */
 	cfg->nopty = 0;
     }
     if (!strcmp(p, "-T")) {
 	RETURN(1);
 	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
-	SAVEABLE(0);
+	SAVEABLE(1);
 	cfg->nopty = 1;
     }