diff options
author | dtucker <dtucker> | 2010-01-08 21:54:31 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2010-01-08 21:54:31 +0000 |
commit | 194a946278d284669588b3c0af57ae5347c8b138 (patch) | |
tree | 44f74c7e44d624387b951471b99309b250a823b3 | |
parent | 455e23bb6de1995d07afd55c885d1a432fa5a657 (diff) | |
download | openssh-194a946278d284669588b3c0af57ae5347c8b138.tar.gz |
- dtucker@cvs.openbsd.org 2010/01/08 21:50:49
[sftp.c]
Fix two warnings: possibly used unitialized and use a nul byte instead of
NULL pointer. ok djm@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sftp.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -154,6 +154,10 @@ [sftp-server.c] bz#1566 don't unnecessarily dup() in and out fds for sftp-server; ok markus@ + - dtucker@cvs.openbsd.org 2010/01/08 21:50:49 + [sftp.c] + Fix two warnings: possibly used unitialized and use a nul byte instead of + NULL pointer. ok djm@ - (dtucker) [Makefile.in added roaming_client.c roaming_serv.c] Import new files for roaming and add to Makefile. - (dtucker) [Makefile.in] .c files do not belong in the OBJ lines. @@ -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> * @@ -1568,7 +1568,7 @@ complete_ambiguous(const char *word, char **list, size_t count) if (matchlen > strlen(word)) { char *tmp = xstrdup(list[0]); - tmp[matchlen] = NULL; + tmp[matchlen] = '\0'; return tmp; } } @@ -2062,7 +2062,7 @@ int 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; |