diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-03-18 14:41:50 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-03-18 15:28:41 +0000 |
| commit | 8d909960c69378a54d9493586d74ba361948bf49 (patch) | |
| tree | 8d0cda6714e58719719c37c7422d02add3f97d84 /src | |
| parent | 5e6d12accb0bdfa1cee9d8c9a1ecec3131b9f502 (diff) | |
Expansions: check numeric values of IPv4 address components
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/string.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/src/string.c b/src/src/string.c index cec59506d..4850fd958 100644 --- a/src/src/string.c +++ b/src/src/string.c @@ -42,7 +42,7 @@ int yield = 4; /* If an optional mask is permitted, check for it. If found, pass back the offset. */ -if (maskptr != NULL) +if (maskptr) { const uschar *ss = s + Ustrlen(s); *maskptr = 0; @@ -79,7 +79,7 @@ if (Ustrchr(s, ':') != NULL) if we hit the / that introduces a mask or the % that introduces the interface specifier (scope id) of a link-local address. */ - if (*s == 0 || *s == '%' || *s == '/') return had_double_colon? yield : 0; + if (*s == 0 || *s == '%' || *s == '/') return had_double_colon ? yield : 0; /* If a component starts with an additional colon, we have hit a double colon. This is permitted to appear once only, and counts as at least @@ -135,13 +135,16 @@ if (Ustrchr(s, ':') != NULL) for (i = 0; i < 4; i++) { + long n; + uschar * end; + if (i != 0 && *s++ != '.') return 0; - if (!isdigit(*s++)) return 0; - if (isdigit(*s) && isdigit(*(++s))) s++; + n = strtol(CCS s, CSS &end, 10); + if (n > 255 || n < 0 || end <= s || end > s+3) return 0; + s = end; } -return (*s == 0 || (*s == '/' && maskptr != NULL && *maskptr != 0))? - yield : 0; +return !*s || (*s == '/' && maskptr && *maskptr != 0) ? yield : 0; } #endif /* COMPILE_UTILITY */ |