upstream commit

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

OpenBSD-Commit-ID: bb926825c53724c069df68a93a2597f9192f7e7b

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index e64982283c0f780d0814d670988774b2073d8537..8fb7ffe71d6797144a1cf27da749d57958a8adbc 100644 (file)
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.75 2018/01/23 05:27:21 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.76 2018/02/07 22:52:45 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -471,8 +471,7 @@ check_authkeys_file(FILE *f, char *file, struct sshkey *key, struct passwd *pw)
                /* Always consume entire file */
                if (found_key)
                        continue;
-               if (found != NULL)
-                       sshkey_free(found);
+               sshkey_free(found);
                found = sshkey_new(sshkey_is_cert(key) ? KEY_UNSPEC : key->type);
                if (found == NULL)
                        goto done;
@@ -563,8 +562,7 @@ check_authkeys_file(FILE *f, char *file, struct sshkey *key, struct passwd *pw)
                }
        }
  done:
-       if (found != NULL)
-               sshkey_free(found);
+       sshkey_free(found);
        if (!found_key)
                debug2("key not found");
        return found_key;

diff --git a/ssh-keysign.c b/ssh-keysign.c
index ac5034de860ff558d72a323b829eae30af456ae5..17e87a281309b67c7ef7c223eea6e4a60780c22c 100644 (file)
--- 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;

diff --git a/sshconnect.c b/sshconnect.c
index cddf22e1ce9fb000a08cb8322186d4d9c28ba3bd..e37bb085661e0f74c960bbe31227cdbca59290ef 100644 (file)
--- 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)

diff --git a/sshconnect2.c b/sshconnect2.c
index 870c3d270dc1c894bd4a07fb57c8fd0c52067179..8138e46e05a79552ab5f537767d49644b74b70f4 100644 (file)
--- 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);