upstream commit

ssh_free checks for and handles NULL args, remove NULL
checks from remaining callers.  ok djm@

OpenBSD-Commit-ID: bb926825c53724c069df68a93a2597f9192f7e7b

1 files changed, 2 insertions, 3 deletions

diff --git a/sshconnect.c b/sshconnect.c
index cddf22e1c..e37bb0856 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)