From b062f051ec5678a1f056656601715c9d047e6fc2 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 29 Apr 1998 17:14:29 +0000
Subject: Update.

1998-04-23 07:31  H.J. Lu  <hjl@gnu.org>

	* resolv/inet_addr.c (inet_aton): Use __strtoul_internal to
	check overflow.
	* resolv/Makefile (tests): New, add tst-aton.
	* resolv/tst-aton.c: New file.

1998-04-29  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/sparc/sparc32/dl-machine.h (WEAKADDR): Add missing
	semicolon.

	* sysdeps/unix/sysv/linux/alpha/bits/signum.h: Add SIGCLD definition.
---
 resolv/Makefile    |  2 ++
 resolv/inet_addr.c | 24 ++++++++++++++++++++++--
 resolv/tst-aton.c  | 22 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 resolv/tst-aton.c

(limited to 'resolv')

diff --git a/resolv/Makefile b/resolv/Makefile
index 178aae52a1..938cde75dd 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -27,6 +27,8 @@ distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h \
 
 routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init
 
+tests = tst-aton
+
 include ../Makeconfig
 
 extra-libs := libresolv libnss_dns
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c
index 7e38af223f..635dd4596d 100644
--- a/resolv/inet_addr.c
+++ b/resolv/inet_addr.c
@@ -63,6 +63,11 @@ static char rcsid[] = "$Id$";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
+#ifdef _LIBC
+# include <stdlib.h>
+# include <limits.h>
+# include <errno.h>
+#endif
 #include "../conf/portability.h"
 
 /* these are compatibility routines, not needed on recent BSD releases */
@@ -91,7 +96,7 @@ inet_addr(cp)
  */
 int
 inet_aton(cp, addr)
-	register const char *cp;
+	const char *cp;
 	struct in_addr *addr;
 {
 	register u_int32_t val;	/* changed from u_long --david */
@@ -99,7 +104,11 @@ inet_aton(cp, addr)
 	register char c;
 	u_int parts[4];
 	register u_int *pp = parts;
+#ifdef _LIBC
+	int saved_errno = errno;
 
+	__set_errno (0);
+#endif
 	c = *cp;
 	for (;;) {
 		/*
@@ -109,7 +118,7 @@ inet_aton(cp, addr)
 		 */
 		if (!isdigit(c))
 			return (0);
-		val = 0; base = 10;
+		base = 10;
 		if (c == '0') {
 			c = *++cp;
 			if (c == 'x' || c == 'X')
@@ -117,6 +126,16 @@ inet_aton(cp, addr)
 			else
 				base = 8;
 		}
+#ifdef _LIBC
+		val = strtoul (cp, (char **) &cp, base);
+		if (val == ULONG_MAX && errno == ERANGE)
+		{
+			__set_errno (saved_errno);
+			return 0;
+		}
+		c = *cp;
+#else
+		val = 0;
 		for (;;) {
 			if (isascii(c) && isdigit(c)) {
 				val = (val * base) + (c - '0');
@@ -128,6 +147,7 @@ inet_aton(cp, addr)
 			} else
 				break;
 		}
+#endif
 		if (c == '.') {
 			/*
 			 * Internet format:
diff --git a/resolv/tst-aton.c b/resolv/tst-aton.c
new file mode 100644
index 0000000000..818f9ed61b
--- /dev/null
+++ b/resolv/tst-aton.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+enum { buf_size = 16 };
+static char buf[buf_size] = "323543357756889";
+
+int
+main (int argc, char *argv[])
+{
+  struct in_addr addr;
+  int result = 0;
+
+  if (inet_aton (buf, &addr) != 0)
+    {
+      printf ("%s is seen as a valid IP address\n", buf);
+      result = 1;
+    }
+
+  return result;
+}
-- 
cgit v1.2.1