From ff4b04e0d6105849f2b141c035ecd92a4ebc6d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Thu, 10 Mar 2016 20:10:25 +0000
Subject: Vendor import of OpenSSH 7.2p1.

---
 sshbuf-getput-basic.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sshbuf-getput-basic.c')

diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index 8ff8a0a28893..23e0fd7c1cf4 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf-getput-basic.c,v 1.4 2015/01/14 15:02:39 djm Exp $	*/
+/*	$OpenBSD: sshbuf-getput-basic.c,v 1.5 2015/10/20 23:24:25 mmcc Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -131,7 +131,7 @@ sshbuf_get_string_direct(struct sshbuf *buf, const u_char **valp, size_t *lenp)
 		*lenp = 0;
 	if ((r = sshbuf_peek_string_direct(buf, &p, &len)) < 0)
 		return r;
-	if (valp != 0)
+	if (valp != NULL)
 		*valp = p;
 	if (lenp != NULL)
 		*lenp = len;
@@ -168,7 +168,7 @@ sshbuf_peek_string_direct(const struct sshbuf *buf, const u_char **valp,
 		SSHBUF_DBG(("SSH_ERR_MESSAGE_INCOMPLETE"));
 		return SSH_ERR_MESSAGE_INCOMPLETE;
 	}
-	if (valp != 0)
+	if (valp != NULL)
 		*valp = p + 4;
 	if (lenp != NULL)
 		*lenp = len;
@@ -448,7 +448,7 @@ sshbuf_get_bignum2_bytes_direct(struct sshbuf *buf,
 		d++;
 		len--;
 	}
-	if (valp != 0)
+	if (valp != NULL)
 		*valp = d;
 	if (lenp != NULL)
 		*lenp = len;
-- 
cgit v1.2.3