summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sftp.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2014-04-29 19:58:51 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2014-04-29 19:58:51 +0000
commitfc3720e27000414ca9aff0d4ccce2726f1009524 (patch)
treed524adbf2e9bf1d492546233379f6180881637ab /usr.bin/ssh/sftp.c
parente7701d1ab687bebc394f5ebf60b4273c79debc6b (diff)
Move nulling of variable next to where it's freed. ok markus@
Diffstat (limited to 'usr.bin/ssh/sftp.c')
-rw-r--r--usr.bin/ssh/sftp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index c294fa26a6a..02f336ca58d 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.160 2014/04/22 10:07:12 logan Exp $ */
+/* $OpenBSD: sftp.c,v 1.161 2014/04/29 19:58:50 dtucker Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -1820,6 +1820,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,
pwdlen = tmplen + 1; /* track last seen '/' */
}
free(tmp);
+ tmp = NULL;
if (g.gl_matchc == 0)
goto out;
@@ -1827,7 +1828,6 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,
if (g.gl_matchc > 1)
complete_display(g.gl_pathv, pwdlen);
- tmp = NULL;
/* Don't try to extend globs */
if (file == NULL || hadglob)
goto out;