diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2006-12-30 23:37:38 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2006-12-30 23:37:38 +0000 |
| commit | 6ae99dbd38e0269e8af903875b78848b7ab22240 (patch) | |
| tree | 908ff83ffb6097cbeb0cb3adb71608db308262e8 /lib/libc | |
| parent | 11c63848c56e025c7506cfdddfcd7a538a45a11a (diff) | |
RFC4291 declares that IPv6 numeric representation must have no more than
4 hex digits between colons. deraadt ok
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/net/inet_pton.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c index 87206ee8b84..096ff657726 100644 --- a/lib/libc/net/inet_pton.c +++ b/lib/libc/net/inet_pton.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_pton.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ +/* $OpenBSD: inet_pton.c,v 1.7 2006/12/30 23:37:37 itojun Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -128,7 +128,7 @@ inet_pton6(const char *src, u_char *dst) xdigits_u[] = "0123456789ABCDEF"; u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp; const char *xdigits, *curtok; - int ch, saw_xdigit; + int ch, saw_xdigit, count_xdigit; u_int val; memset((tp = tmp), '\0', IN6ADDRSZ); @@ -139,7 +139,7 @@ inet_pton6(const char *src, u_char *dst) if (*++src != ':') return (0); curtok = src; - saw_xdigit = 0; + saw_xdigit = count_xdigit = 0; val = 0; while ((ch = *src++) != '\0') { const char *pch; @@ -147,11 +147,14 @@ inet_pton6(const char *src, u_char *dst) if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) pch = strchr((xdigits = xdigits_u), ch); if (pch != NULL) { + if (count_xdigit >= 4) + return (0); val <<= 4; val |= (pch - xdigits); if (val > 0xffff) return (0); saw_xdigit = 1; + count_xdigit++; continue; } if (ch == ':') { @@ -169,6 +172,7 @@ inet_pton6(const char *src, u_char *dst) *tp++ = (u_char) (val >> 8) & 0xff; *tp++ = (u_char) val & 0xff; saw_xdigit = 0; + count_xdigit = 0; val = 0; continue; } @@ -176,6 +180,7 @@ inet_pton6(const char *src, u_char *dst) inet_pton4(curtok, tp) > 0) { tp += INADDRSZ; saw_xdigit = 0; + count_xdigit = 0; break; /* '\0' was seen by inet_pton4(). */ } return (0); |