Use ">", not ">=" when comparing length to HOST_NAME_MAX since
authormillert <millert@openbsd.org>
Fri, 16 Jan 2015 18:20:14 +0000 (18:20 +0000)
committermillert <millert@openbsd.org>
Fri, 16 Jan 2015 18:20:14 +0000 (18:20 +0000)
otherwise we end up needlessly replacing a NUL with a NUL.
OK deraadt@

lib/libc/net/getnetent.c

index fc98044..b16575b 100644 (file)
@@ -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");