===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/packet.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- src/usr.bin/ssh/packet.c	2015/12/04 16:41:28	1.218
+++ src/usr.bin/ssh/packet.c	2015/12/10 17:08:40	1.219
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.218 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.219 2015/12/10 17:08:40 mmcc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -508,10 +508,8 @@
 		error("%s: cipher_cleanup failed: %s", __func__, ssh_err(r));
 	if ((r = cipher_cleanup(&state->receive_context)) != 0)
 		error("%s: cipher_cleanup failed: %s", __func__, ssh_err(r));
-	if (ssh->remote_ipaddr) {
-		free(ssh->remote_ipaddr);
-		ssh->remote_ipaddr = NULL;
-	}
+	free(ssh->remote_ipaddr);
+	ssh->remote_ipaddr = NULL;
 	free(ssh->state);
 	ssh->state = NULL;
 }
@@ -1772,8 +1770,7 @@
 				if ((r = sshpkt_get_u8(ssh, NULL)) != 0 ||
 				    (r = sshpkt_get_string(ssh, &msg, NULL)) != 0 ||
 				    (r = sshpkt_get_string(ssh, NULL, NULL)) != 0) {
-					if (msg)
-						free(msg);
+					free(msg);
 					return r;
 				}
 				debug("Remote: %.900s", msg);
@@ -2550,8 +2547,7 @@
 	newkey = NULL;
 	r = 0;
  out:
-	if (newkey != NULL)
-		free(newkey);
+	free(newkey);
 	if (b != NULL)
 		sshbuf_free(b);
 	return r;