diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sftp.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -44,6 +44,9 @@ | |||
44 | make compiling against OpenSSL optional (make OPENSSL=no); | 44 | make compiling against OpenSSL optional (make OPENSSL=no); |
45 | reduces algorithms to curve25519, aes-ctr, chacha, ed25519; | 45 | reduces algorithms to curve25519, aes-ctr, chacha, ed25519; |
46 | allows us to explore further options; with and ok djm | 46 | allows us to explore further options; with and ok djm |
47 | - dtucker@cvs.openbsd.org 2014/04/29 19:58:50 | ||
48 | [sftp.c] | ||
49 | Move nulling of variable next to where it's freed. ok markus@ | ||
47 | 50 | ||
48 | 20140430 | 51 | 20140430 |
49 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already | 52 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.160 2014/04/22 10:07:12 logan Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.161 2014/04/29 19:58:50 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1842,6 +1842,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, | |||
1842 | pwdlen = tmplen + 1; /* track last seen '/' */ | 1842 | pwdlen = tmplen + 1; /* track last seen '/' */ |
1843 | } | 1843 | } |
1844 | free(tmp); | 1844 | free(tmp); |
1845 | tmp = NULL; | ||
1845 | 1846 | ||
1846 | if (g.gl_matchc == 0) | 1847 | if (g.gl_matchc == 0) |
1847 | goto out; | 1848 | goto out; |
@@ -1849,7 +1850,6 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, | |||
1849 | if (g.gl_matchc > 1) | 1850 | if (g.gl_matchc > 1) |
1850 | complete_display(g.gl_pathv, pwdlen); | 1851 | complete_display(g.gl_pathv, pwdlen); |
1851 | 1852 | ||
1852 | tmp = NULL; | ||
1853 | /* Don't try to extend globs */ | 1853 | /* Don't try to extend globs */ |
1854 | if (file == NULL || hadglob) | 1854 | if (file == NULL || hadglob) |
1855 | goto out; | 1855 | goto out; |