1 files changed, 18 insertions, 20 deletions

diff --git a/src/lib/libc/net/getservent.c b/src/lib/libc/net/getservent.c
index 316891450e..bad3316f6c 100644
--- a/src/lib/libc/net/getservent.c
+++ b/src/lib/libc/net/getservent.c
@@ -1,5 +1,3 @@
-/*      $NetBSD: getservent.c,v 1.4 1995/02/25 06:20:38 cgd Exp $       */
-
 /*
  * Copyright (c) 1983, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -12,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -34,11 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getservent.c        8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$NetBSD: getservent.c,v 1.4 1995/02/25 06:20:38 cgd Exp $";
-#endif
+static char rcsid[] = "$OpenBSD: getservent.c,v 1.6 2003/06/02 20:18:35 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -80,20 +70,25 @@ endservent()
 struct servent *
 getservent()
 {
-        char *p;
-        register char *cp, **q;
+        char *p, *cp, **q, *endp;
+        long l;
+        size_t len;
 
         if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
                 return (NULL);
 again:
-        if ((p = fgets(line, BUFSIZ, servf)) == NULL)
+        if ((p = fgetln(servf, &len)) == NULL)
                 return (NULL);
-        if (*p == '#')
+        if (p[len-1] == '\n')
+                len--;
+        if (len >= sizeof(line) || len == 0)
                 goto again;
-        cp = strpbrk(p, "#\n");
-        if (cp == NULL)
+        p = memcpy(line, p, len);
+        line[len] = '\0';
+        if (*p == '#')
                 goto again;
-        *cp = '\0';
+        if ((cp = strchr(p, '#')) != NULL)
+                *cp = '\0';
         serv.s_name = p;
         p = strpbrk(p, " \t");
         if (p == NULL)
@@ -105,7 +100,10 @@ again:
         if (cp == NULL)
                 goto again;
         *cp++ = '\0';
-        serv.s_port = htons((u_short)atoi(p));
+        l = strtol(p, &endp, 10);
+        if (endp == p || *endp != '\0' || l < 0 || l > USHRT_MAX)
+                goto again;
+        serv.s_port = htons((in_port_t)l);
         serv.s_proto = cp;
         q = serv.s_aliases = serv_aliases;
         cp = strpbrk(cp, " \t");