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 /sshconnect.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 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index cddf22e1..e37bb085 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.292 2018/01/23 18:33:49 stsp Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.293 2018/02/07 22:52:45 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1177,8 +1177,7 @@ fail: host_key = raw_key; goto retry; } - if (raw_key != NULL) - sshkey_free(raw_key); + sshkey_free(raw_key); free(ip); free(host); if (host_hostkeys != NULL) |