diff options
| -rw-r--r-- | src/tool_urlglob.c | 48 | ||||
| -rw-r--r-- | tests/data/test1230 | 2 |
2 files changed, 46 insertions, 4 deletions
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index ec5014b97..943e0ab88 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -302,6 +302,36 @@ static GlobCode glob_range(URLGlob *glob, char **patternp, return GLOB_OK; } +static bool peek_ipv6(const char *str, size_t *skip) +{ + /* + * Scan for a potential IPv6 literal. + * - Valid globs contain a hyphen and <= 1 colon. + * - IPv6 literals contain no hyphens and >= 2 colons. + */ + size_t i = 0; + size_t colons = 0; + if(str[i++] != '[') { + return FALSE; + } + for(;;) { + const char c = str[i++]; + if(ISALNUM(c) || c == '.' || c == '%') { + /* ok */ + } + else if(c == ':') { + colons++; + } + else if(c == ']') { + *skip = i; + return colons >= 2; + } + else { + return FALSE; + } + } +} + static GlobCode glob_parse(URLGlob *glob, char *pattern, size_t pos, unsigned long *amount) { @@ -315,8 +345,20 @@ static GlobCode glob_parse(URLGlob *glob, char *pattern, while(*pattern && !res) { char *buf = glob->glob_buffer; - int sublen = 0; - while(*pattern && *pattern != '{' && *pattern != '[') { + size_t sublen = 0; + while(*pattern && *pattern != '{') { + if(*pattern == '[') { + /* Skip over potential IPv6 literals. */ + size_t skip; + if(peek_ipv6(pattern, &skip)) { + memcpy(buf, pattern, skip); + buf += skip; + pattern += skip; + sublen += skip; + continue; + } + break; + } if(*pattern == '}' || *pattern == ']') return GLOBERROR("unmatched close brace/bracket", pos, GLOB_ERROR); diff --git a/tests/data/test1230 b/tests/data/test1230 index b16269d2d..3c1d3d448 100644 --- a/tests/data/test1230 +++ b/tests/data/test1230 @@ -56,7 +56,7 @@ HTTP CONNECT to IPv6 numerical address </name> # 0x4ce == 1230, the test number <command> --g http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT +http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT </command> </client> |