From 903ddd98785ca091a8995db4e69a722855ebd337 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 30 Apr 2005 13:50:34 +0000 Subject: [PATCH] inet_aton doesn't overwrite the IP address unless it is valid. --- src/core/misc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core/misc.c b/src/core/misc.c index 0fe6cb47..22930fcf 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -146,9 +146,8 @@ int strcasecmp(const char *a, const char *b) /************************************************************************** INET_ATON - Convert an ascii x.x.x.x to binary form **************************************************************************/ -int inet_aton(const char *start, in_addr *i) -{ - const char *p = start; +int inet_aton ( const char *cp, struct in_addr *inp ) { + const char *p = cp; const char *digits_start; unsigned long ip = 0; unsigned long val; @@ -160,8 +159,11 @@ int inet_aton(const char *start, in_addr *i) if ( ( j < 3 ) && ( *(p++) != '.' ) ) return 0; ip = (ip << 8) | val; } - i->s_addr = htonl(ip); - return p - start; + if ( *p == '\0' ) { + inp->s_addr = htonl(ip); + return 1; + } + return 0; } unsigned long strtoul(const char *p, const char **endp, int base)