tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2014/04/29 19:58:50

Browse Source 
[sftp.c]
     Move nulling of variable next to where it's freed.  ok markus@
This commit is contained in:
Damien Miller 2014-05-15 14:24:59 +10:00
parent 1f0311c7c7
commit d7fd8bedd4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -44,6 +44,9 @@
make compiling against OpenSSL optional (make OPENSSL=no); make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519; reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm allows us to explore further options; with and ok djm
- dtucker@cvs.openbsd.org 2014/04/29 19:58:50
[sftp.c]
Move nulling of variable next to where it's freed. ok markus@
20140430 20140430
- (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already

4
sftp.c
View File

@ -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> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1842,6 +1842,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,
pwdlen = tmplen + 1; /* track last seen '/' */ pwdlen = tmplen + 1; /* track last seen '/' */
} }
free(tmp); free(tmp);
tmp = NULL;
if (g.gl_matchc == 0) if (g.gl_matchc == 0)
goto out; goto out;
@ -1849,7 +1850,6 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,
if (g.gl_matchc > 1) if (g.gl_matchc > 1)
complete_display(g.gl_pathv, pwdlen); complete_display(g.gl_pathv, pwdlen);
tmp = NULL;
/* Don't try to extend globs */ /* Don't try to extend globs */
if (file == NULL || hadglob) if (file == NULL || hadglob)
goto out; goto out;