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 /sshconnect2.c | |
| parent | aee49b2a89b6b323c80dd3b431bd486e51f94c8c (diff) | |
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 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 870c3d27..8138e46e 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.267 2018/01/23 05:27:21 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.268 2018/02/07 22:52:45 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -624,8 +624,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh) } } done: - if (key != NULL) - key_free(key); + key_free(key); free(pkalg); free(pkblob); |