diff options
Diffstat (limited to 'src/libutil/addr.c')
| -rw-r--r-- | src/libutil/addr.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/libutil/addr.c b/src/libutil/addr.c index 7fa634f6f..4babfb1d2 100644 --- a/src/libutil/addr.c +++ b/src/libutil/addr.c @@ -510,19 +510,11 @@ rspamd_parse_inet_address_ip6 (const guchar *text, gsize len, gpointer target) g_assert (text != NULL); g_assert (target != NULL); + p = text; if (len == 0) { len = strlen (text); } - /* Ignore trailing semicolon */ - if (text[0] == ':') { - p = text + 1; - len--; - } - else { - p = text; - } - /* Check IPv6 scope */ if ((percent = memchr (p, '%', len)) != NULL && percent > p) { len = percent - p; /* Ignore scope */ @@ -535,6 +527,12 @@ rspamd_parse_inet_address_ip6 (const guchar *text, gsize len, gpointer target) len -= sizeof ("IPv6:") - 1; } + /* Ignore leading colon */ + if (len > 0 && *p == ':') { + p++; + len--; + } + for (/* void */; len; len--) { t = *p++; @@ -580,7 +578,7 @@ rspamd_parse_inet_address_ip6 (const guchar *text, gsize len, gpointer target) } if (++nibbles > 4) { - /* Too many dots */ + /* Too many digits */ return FALSE; } |