Use strtol() and strtoul() instead of atoi(). This allows us to catch

errors reasonably and deal correctly with unsigned quantities.

3 files changed, 29 insertions, 16 deletions

diff --git a/src/lib/libc/net/getprotoent.c b/src/lib/libc/net/getprotoent.c
index 2bef526e7a..2f8b267611 100644
--- a/src/lib/libc/net/getprotoent.c
+++ b/src/lib/libc/net/getprotoent.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getprotoent.c,v 1.3 1998/03/16 05:06:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: getprotoent.c,v 1.4 1999/09/03 16:23:18 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -74,7 +74,8 @@ endprotoent()
 struct protoent *
 getprotoent()
 {
-        char *p, *cp, **q;
+        char *p, *cp, **q, *endp;
+        long l;
         size_t len;
 
         if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
@@ -102,7 +103,10 @@ again:
         p = strpbrk(cp, " \t");
         if (p != NULL)
                 *p++ = '\0';
-        proto.p_proto = atoi(cp);
+        l = strtol(cp, &endp, 10);
+        if (endp == cp || *endp != '\0' || l < 0 || l >= INT_MAX)
+                goto again;
+        proto.p_proto = l;
         q = proto.p_aliases = proto_aliases;
         if (p != NULL) {
                 cp = p;
diff --git a/src/lib/libc/net/getservent.c b/src/lib/libc/net/getservent.c
index 7d8cb6d8ca..ff6bf1e57f 100644
--- a/src/lib/libc/net/getservent.c
+++ b/src/lib/libc/net/getservent.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservent.c,v 1.4 1998/03/16 05:07:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: getservent.c,v 1.5 1999/09/03 16:23:19 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -74,7 +74,8 @@ endservent()
 struct servent *
 getservent()
 {
-        char *p, *cp, **q;
+        char *p, *cp, **q, *endp;
+        long l;
         size_t len;
 
         if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
@@ -103,7 +104,10 @@ again:
         if (cp == NULL)
                 goto again;
         *cp++ = '\0';
-        serv.s_port = htons((in_port_t)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");
diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
index df176b7fa1..2e8023ad31 100644
--- a/src/lib/libc/net/res_init.c
+++ b/src/lib/libc/net/res_init.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_init.c,v 1.16 1998/03/16 05:07:01 millert Exp $   */
+/*      $OpenBSD: res_init.c,v 1.17 1999/09/03 16:23:19 millert Exp $   */
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_init.c  8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.16 1998/03/16 05:07:01 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.17 1999/09/03 16:23:19 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -459,7 +459,8 @@ res_setoptions(options, source)
         char *options, *source;
 {
         char *cp = options;
-        int i;
+        char *endp;
+        long l;
 
 #ifdef DEBUG
         if (_res.options & RES_DEBUG)
@@ -472,15 +473,19 @@ res_setoptions(options, source)
                         cp++;
                 /* search for and process individual options */
                 if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-                        i = atoi(cp + sizeof("ndots:") - 1);
-                        if (i <= RES_MAXNDOTS)
-                                _res.ndots = i;
-                        else
-                                _res.ndots = RES_MAXNDOTS;
+                        char *p = cp + sizeof("ndots:") - 1;
+                        l = strtol(p, &endp, 10);
+                        if (l >= 0 && endp != p &&
+                            (*endp = '\0' || issapce(*endp))) {
+                                if (l <= RES_MAXNDOTS)
+                                        _res.ndots = l;
+                                else
+                                        _res.ndots = RES_MAXNDOTS;
 #ifdef DEBUG
-                        if (_res.options & RES_DEBUG)
-                                printf(";;\tndots=%d\n", _res.ndots);
+                                if (_res.options & RES_DEBUG)
+                                        printf(";;\tndots=%d\n", _res.ndots);
 #endif
+                        }
                 } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
 #ifdef DEBUG
                         if (!(_res.options & RES_DEBUG)) {