diff options
| author |   mmcc <mmcc@openbsd.org> | 2015-12-11 02:31:47 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2015-12-11 02:31:47 +0000 |
| commit | 5fb8de7dd2c66851536ccb7dd27da54220e963f9 (patch) | |
| tree | 56443100bade97d819c409a4e9fc644411d6a243 /usr.bin/ssh/sshconnect2.c | |
| parent | fflush stdout so that output is seen even when running in debug mode when (diff) | |
| download | wireguard-openbsd-5fb8de7dd2c66851536ccb7dd27da54220e963f9.tar.xz wireguard-openbsd-5fb8de7dd2c66851536ccb7dd27da54220e963f9.zip | |
Remove NULL-checks before sshkey_free().
ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 07dc1c4d9da..1dd67cf34f7 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.234 2015/12/11 02:20:28 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.235 2015/12/11 02:31:47 mmcc Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1410,8 +1410,7 @@ pubkey_cleanup(Authctxt *authctxt) for (id = TAILQ_FIRST(&authctxt->keys); id; id = TAILQ_FIRST(&authctxt->keys)) { TAILQ_REMOVE(&authctxt->keys, id, next); - if (id->key) - sshkey_free(id->key); + sshkey_free(id->key); free(id->filename); free(id); } |