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

packet.c

diff --git a/packet.c b/packet.c
index 8d9bcd8..27e85e3 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.220 2015/12/11 03:24:25 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.221 2015/12/11 04:21:12 mmcc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2453,8 +2453,7 @@
 		goto out;
 	r = sshbuf_put_stringb(m, b);
  out:
-	if (b != NULL)
-		sshbuf_free(b);
+	sshbuf_free(b);
 	return r;
 }
 
@@ -2590,8 +2589,7 @@
 	r = 0;
  out:
 	free(newkey);
-	if (b != NULL)
-		sshbuf_free(b);
+	sshbuf_free(b);
 	return r;
 }
 
@@ -2624,10 +2622,8 @@
  out:
 	if (r != 0 || kexp == NULL) {
 		if (kex != NULL) {
-			if (kex->my != NULL)
-				sshbuf_free(kex->my);
-			if (kex->peer != NULL)
-				sshbuf_free(kex->peer);
+			sshbuf_free(kex->my);
+			sshbuf_free(kex->peer);
 			free(kex);
 		}
 		if (kexp != NULL)