===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- src/usr.bin/ssh/sftp.c	2010/01/04 02:03:57	1.116
+++ src/usr.bin/ssh/sftp.c	2010/01/08 21:50:49	1.117
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.116 2010/01/04 02:03:57 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.117 2010/01/08 21:50:49 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1544,7 +1544,7 @@
 		if (matchlen > strlen(word)) {
 			char *tmp = xstrdup(list[0]);
 
-			tmp[matchlen] = NULL;
+			tmp[matchlen] = '\0';
 			return tmp;
 		}
 	} 
@@ -2014,7 +2014,7 @@
 main(int argc, char **argv)
 {
 	int in, out, ch, err;
-	char *host, *userhost, *cp, *file2 = NULL;
+	char *host = NULL, *userhost, *cp, *file2 = NULL;
 	int debug_level = 0, sshver = 2;
 	char *file1 = NULL, *sftp_server = NULL;
 	char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;