diff options
author | mmcc@openbsd.org <mmcc@openbsd.org> | 2015-12-11 02:31:47 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-12-18 14:49:32 +1100 |
commit | 89540b6de025b80404a0cb8418c06377f3f98848 (patch) | |
tree | e5ba6b2acbaab9aa3b89c3ff0c0b14adddfa19db /ssh-keygen.c | |
parent | 79394ed6d74572c2d2643d73937dad33727fc240 (diff) |
upstream commit
Remove NULL-checks before sshkey_free().
ok djm@
Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 6ac1fa603..ff3f710de 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.285 2015/12/04 16:41:28 markus Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.286 2015/12/11 02:31:47 mmcc Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2166,8 +2166,7 @@ do_gen_krl(struct passwd *pw, int updating, int argc, char **argv) | |||
2166 | close(fd); | 2166 | close(fd); |
2167 | sshbuf_free(kbuf); | 2167 | sshbuf_free(kbuf); |
2168 | ssh_krl_free(krl); | 2168 | ssh_krl_free(krl); |
2169 | if (ca != NULL) | 2169 | sshkey_free(ca); |
2170 | sshkey_free(ca); | ||
2171 | } | 2170 | } |
2172 | 2171 | ||
2173 | static void | 2172 | static void |