===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshbuf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/ssh/sshbuf.c	2015/10/05 17:11:21	1.4
+++ src/usr.bin/ssh/sshbuf.c	2015/12/11 04:21:12	1.5
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf.c,v 1.4 2015/10/05 17:11:21 djm Exp $	*/
+/*	$OpenBSD: sshbuf.c,v 1.5 2015/12/11 04:21:12 mmcc Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -161,10 +161,8 @@
 	 * If we are a child, the free our parent to decrement its reference
 	 * count and possibly free it.
 	 */
-	if (buf->parent != NULL) {
-		sshbuf_free(buf->parent);
-		buf->parent = NULL;
-	}
+	sshbuf_free(buf->parent);
+	buf->parent = NULL;
 	/*
 	 * If we are a parent with still-extant children, then don't free just
 	 * yet. The last child's call to sshbuf_free should decrement our