From d03186af8de9b660564ccc1804d2a9c2e93b2e58 Mon Sep 17 00:00:00 2001 From: dtucker Date: Fri, 8 Jan 2010 21:54:31 +0000 Subject: [PATCH] - 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@ --- ChangeLog | 4 ++++ sftp.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11093e7a..b1350dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/sftp.c b/sftp.c index 4b12fae4..9f5fa354 100644 --- a/sftp.c +++ b/sftp.c @@ -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 * @@ -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; -- 2.45.1