commit 52d7078421844b2f88329f5be3de370b0a938636
author mmcc@openbsd.org <mmcc@openbsd.org> Fri Dec 11 04:21:11 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Dec 18 14:50:48 2015 +1100
tree 1241462a841b14259755de181563cc83acd42109
parent a4b9e0f4e4a6980a0eb8072f76ea611cab5b77e7

upstream commit

Remove NULL-checks before sshbuf_free().

ok djm@

Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917

sshkey.c

diff --git a/sshkey.c b/sshkey.c
index 96a4d90..87b093e 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.30 2015/12/11 02:31:47 mmcc Exp $ */
+/* $OpenBSD: sshkey.c,v 1.31 2015/12/11 04:21:12 mmcc Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -420,12 +420,9 @@
 
 	if (cert == NULL)
 		return;
-	if (cert->certblob != NULL)
-		sshbuf_free(cert->certblob);
-	if (cert->critical != NULL)
-		sshbuf_free(cert->critical);
-	if (cert->extensions != NULL)
-		sshbuf_free(cert->extensions);
+	sshbuf_free(cert->certblob);
+	sshbuf_free(cert->critical);
+	sshbuf_free(cert->extensions);
 	free(cert->key_id);
 	for (i = 0; i < cert->nprincipals; i++)
 		free(cert->principals[i]);
@@ -2472,8 +2469,7 @@
 		sshbuf_reset(cert);
 	free(sig_blob);
 	free(ca_blob);
-	if (principals != NULL)
-		sshbuf_free(principals);
+	sshbuf_free(principals);
 	return ret;
 }
 
@@ -3487,10 +3483,8 @@
  out:
 	explicit_bzero(&ciphercontext, sizeof(ciphercontext));
 	explicit_bzero(buf, sizeof(buf));
-	if (buffer != NULL)
-		sshbuf_free(buffer);
-	if (encrypted != NULL)
-		sshbuf_free(encrypted);
+	sshbuf_free(buffer);
+	sshbuf_free(encrypted);
 
 	return r;
 }
@@ -3644,8 +3638,7 @@
 	pub = NULL;
 
  out:
-	if (copy != NULL)
-		sshbuf_free(copy);
+	sshbuf_free(copy);
 	sshkey_free(pub);
 	return r;
 }
@@ -3760,10 +3753,8 @@
 	explicit_bzero(&ciphercontext, sizeof(ciphercontext));
 	free(comment);
 	sshkey_free(prv);
-	if (copy != NULL)
-		sshbuf_free(copy);
-	if (decrypted != NULL)
-		sshbuf_free(decrypted);
+	sshbuf_free(copy);
+	sshbuf_free(decrypted);
 	return r;
 }
 #endif /* WITH_SSH1 */