diff options
| -rw-r--r-- | lib/urlapi.c | 7 | ||||
| -rw-r--r-- | tests/unit/unit1653.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/urlapi.c b/lib/urlapi.c index 6919ff1bd..3af8e9399 100644 --- a/lib/urlapi.c +++ b/lib/urlapi.c @@ -510,8 +510,11 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname) portptr = &hostname[len]; else if('%' == endbracket) { int zonelen = len; - if(1 == sscanf(hostname + zonelen, "25%*[^]]]%c%n", &endbracket, &len)) - portptr = &hostname[--zonelen + len]; + if(1 == sscanf(hostname + zonelen, "25%*[^]]%c%n", &endbracket, &len)) { + if(']' != endbracket) + return CURLUE_MALFORMED_INPUT; + portptr = &hostname[--zonelen + len + 1]; + } else return CURLUE_MALFORMED_INPUT; } diff --git a/tests/unit/unit1653.c b/tests/unit/unit1653.c index b68d8dc4f..4e326f51b 100644 --- a/tests/unit/unit1653.c +++ b/tests/unit/unit1653.c @@ -83,6 +83,14 @@ UNITTEST_START free(ipv6port); curl_url_cleanup(u); + /* Valid IPv6 with zone index without port number */ + u = curl_url(); + ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]"); + ret = Curl_parse_port(u, ipv6port); + fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); + free(ipv6port); + curl_url_cleanup(u); + /* Valid IPv6 with port number */ u = curl_url(); ipv6port = strdup("[fe80::250:56ff:fea7:da15]:81"); |