diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-02-07 22:52:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-02-09 20:00:18 +1100 |
| commit | f1f047fb031c0081dbc8738f05bf5d4cc47acadf (patch) | |
| tree | 1be06338e02d74a923527cdc03b88b472294a420 /ssh-keysign.c | |
| parent | aee49b2a89b6b323c80dd3b431bd486e51f94c8c (diff) | |
| download | openssh-git-f1f047fb031c0081dbc8738f05bf5d4cc47acadf.tar.gz | |
upstream commit
ssh_free checks for and handles NULL args, remove NULL
checks from remaining callers. ok djm@
OpenBSD-Commit-ID: bb926825c53724c069df68a93a2597f9192f7e7b
Diffstat (limited to 'ssh-keysign.c')
| -rw-r--r-- | ssh-keysign.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index ac5034de..17e87a28 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keysign.c,v 1.52 2016/02/15 09:47:49 dtucker Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.53 2018/02/07 22:52:45 dtucker Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -158,7 +158,7 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret, debug3("%s: fail %d", __func__, fail); - if (fail && key != NULL) + if (fail) sshkey_free(key); else if (ret != NULL) *ret = key; |