upstream commit

Remove NULL-checks before sshbuf_free().

ok djm@

Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917

1 files changed, 3 insertions, 5 deletions

diff --git a/ssh-rsa.c b/ssh-rsa.c
index 4eb00c87c..53d44d1f3 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.57 2015/12/10 17:08:40 mmcc Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.58 2015/12/11 04:21:12 mmcc Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -156,8 +156,7 @@ ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
                 explicit_bzero(sig, slen);
                 free(sig);
         }
-        if (b != NULL)
-                sshbuf_free(b);
+        sshbuf_free(b);
         return ret;
 }
 
@@ -227,8 +226,7 @@ ssh_rsa_verify(const struct sshkey *key,
                 free(sigblob);
         }
         free(ktype);
-        if (b != NULL)
-                sshbuf_free(b);
+        sshbuf_free(b);
         explicit_bzero(digest, sizeof(digest));
         return ret;
 }