- pedro@cvs.openbsd.org 2004/06/03 12:22:20
[sftp-client.c sftp.c]
initialize pointers, ok markus@
diff --git a/ChangeLog b/ChangeLog
index ae236a9..3fb1d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- dtucker@cvs.openbsd.org 2004/06/01 14:20:45
[auth2-chall.c]
Remove redundant #include; ok markus@
+ - pedro@cvs.openbsd.org 2004/06/03 12:22:20
+ [sftp-client.c sftp.c]
+ initialize pointers, ok markus@
20040603
- (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
@@ -1196,4 +1199,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3378 2004/06/15 00:28:24 djm Exp $
+$Id: ChangeLog,v 1.3379 2004/06/15 00:28:56 djm Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 6dcd5de..88276cd 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,7 @@
/* XXX: copy between two remote sites */
#include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.49 2004/05/19 12:17:33 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.50 2004/06/03 12:22:20 pedro Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -992,7 +992,7 @@
TAILQ_ENTRY(outstanding_ack) tq;
};
TAILQ_HEAD(ackhead, outstanding_ack) acks;
- struct outstanding_ack *ack;
+ struct outstanding_ack *ack = NULL;
TAILQ_INIT(&acks);
diff --git a/sftp.c b/sftp.c
index eef9f11..dca5505 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.47 2004/05/26 08:59:57 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.48 2004/06/03 12:22:20 pedro Exp $");
#include "buffer.h"
#include "xmalloc.h"
@@ -1310,7 +1310,7 @@
main(int argc, char **argv)
{
int in, out, ch, err;
- char *host, *userhost, *cp, *file2;
+ char *host, *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;