diff options
| author | Damien Miller <djm@mindrot.org> | 2014-05-15 06:24:59 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-05-15 06:24:59 +0200 |
| commit | d7fd8bedd4619a2ec7fd02aae4c4e1db4431ad9f (patch) | |
| tree | 3a6be31e280328527279322d05a65fd59fc88c99 | |
| parent | - markus@cvs.openbsd.org 2014/04/29 18:01:49 (diff) | |
| download | openssh-d7fd8bedd4619a2ec7fd02aae4c4e1db4431ad9f.tar.xz openssh-d7fd8bedd4619a2ec7fd02aae4c4e1db4431ad9f.zip | |
- dtucker@cvs.openbsd.org 2014/04/29 19:58:50
[sftp.c]
Move nulling of variable next to where it's freed. ok markus@
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sftp.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -44,6 +44,9 @@ make compiling against OpenSSL optional (make OPENSSL=no); reduces algorithms to curve25519, aes-ctr, chacha, ed25519; 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 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already @@ -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> * @@ -1842,6 +1842,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; @@ -1849,7 +1850,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; |