From eb08145f1507a91cb0eb09f433adc7743d7c3bea Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Thu, 14 May 2015 11:52:43 +0000
Subject: rev 1.3 introduced a check to an if statement without adding braces.
 Claudio points out the size is checked by an earlier test so just remove it
 to restore the original handling of the partial octet case.

Discussed with claudio and gilles.
---
 src/lib/libc/net/inet_net_ntop.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/libc/net/inet_net_ntop.c b/src/lib/libc/net/inet_net_ntop.c
index 35ae7909d3..652b24076e 100644
--- a/src/lib/libc/net/inet_net_ntop.c
+++ b/src/lib/libc/net/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_ntop.c,v 1.7 2012/06/22 19:13:37 gilles Exp $	*/
+/*	$OpenBSD: inet_net_ntop.c,v 1.8 2015/05/14 11:52:43 jsg Exp $	*/
 
 /*
  * Copyright (c) 2012 by Gilles Chehade <gilles@openbsd.org>
@@ -114,8 +114,6 @@ inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
 		if (ep - dst < sizeof ".255")
 			goto emsgsize;
 		if (dst != odst)
-			if (dst + 1 >= ep)
-				goto emsgsize;
 			*dst++ = '.';
 		m = ((1 << b) - 1) << (8 - b);
 		advance = snprintf(dst, ep - dst, "%u", *src & m);
-- 
cgit v1.2.3-55-g6feb