===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- src/usr.bin/ssh/readconf.c	2015/10/25 23:14:03	1.243
+++ src/usr.bin/ssh/readconf.c	2015/10/27 00:49:53	1.244
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.243 2015/10/25 23:14:03 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.244 2015/10/27 00:49:53 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -446,7 +446,7 @@
 
 	/* Fork and execute the command. */
 	if ((pid = fork()) == 0) {
-		char *argv[4];
+		char *argv[] = { shell, "-c", xstrdup(cmd), NULL };
 
 		/* Child.  Permanently give up superuser privileges. */
 		permanently_drop_suid(original_real_uid);
@@ -459,11 +459,6 @@
 		if (devnull > STDERR_FILENO)
 			close(devnull);
 		closefrom(STDERR_FILENO + 1);
-
-		argv[0] = shell;
-		argv[1] = "-c";
-		argv[2] = cmd;
-		argv[3] = NULL;
 
 		execv(argv[0], argv);
 		error("Unable to execute '%.100s': %s", cmd, strerror(errno));