diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2018-02-07 22:52:46 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2018-02-07 22:52:46 +0000 |
| commit | 72db52508ce4c14580f2658af0dd32167355efc4 (patch) | |
| tree | 6a15ae5afb237e1574ef6e99709ff8f6c4ebbfc0 /usr.bin/ssh/sshconnect.c | |
| parent | 0730eb7236cf99fbe49038c58fd48ea81be99906 (diff) | |
ssh_free checks for and handles NULL args, remove NULL checks from remaining
callers. ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index f759df1a25e..fc7a4f9b9dd 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/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 @@ -1149,8 +1149,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) |