From: millert <millert@openbsd.org>
Date: Fri, 16 Jan 2015 18:20:14 +0000 (+0000)
Subject: Use ">", not ">=" when comparing length to HOST_NAME_MAX since
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8e0291465a259d2fd77493645102631be704bf95;p=openbsd

Use ">", not ">=" when comparing length to HOST_NAME_MAX since
otherwise we end up needlessly replacing a NUL with a NUL.
OK deraadt@
---

diff --git a/lib/libc/net/getnetent.c b/lib/libc/net/getnetent.c
index fc98044a37b..b16575b64d1 100644
--- a/lib/libc/net/getnetent.c
+++ b/lib/libc/net/getnetent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetent.c,v 1.16 2015/01/16 18:18:58 millert Exp $ */
+/*	$OpenBSD: getnetent.c,v 1.17 2015/01/16 18:20:14 millert Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -86,7 +86,7 @@ again:
 	if ((cp = strchr(p, '#')) != NULL)
 		*cp = '\0';
 	net.n_name = p;
-	if (strlen(net.n_name) >= HOST_NAME_MAX)
+	if (strlen(net.n_name) > HOST_NAME_MAX)
 		net.n_name[HOST_NAME_MAX] = '\0';
 	cp = strpbrk(p, " \t");
 	if (cp == NULL)
@@ -108,7 +108,7 @@ again:
 		}
 		if (q < &net_aliases[MAXALIASES - 1]) {
 			*q++ = cp;
-			if (strlen(cp) >= HOST_NAME_MAX)
+			if (strlen(cp) > HOST_NAME_MAX)
 				cp[HOST_NAME_MAX] = '\0';
 		}
 		cp = strpbrk(cp, " \t");