Unverified Commit b2809483 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

URL: fix IPv6 numeral address parser 

Regression from 46e16406. Extended test 1560 to verify.

Reported-by: tpaukrt on github
Fixes #3218
Closes #3219
parent 6987e373

lib/urlapi.c

+6 −2
Original line number Diff line number Diff line
@@ -499,9 +499,13 @@ static CURLUcode parse_port(struct Curl_URL *u, char *hostname) 
     (']' == endbracket)) {

    /* this is a RFC2732-style specified IP-address */

    portptr = &hostname[len];

    if(*portptr) {

      if(*portptr != ':')

        return CURLUE_MALFORMED_INPUT;

    }

    else

      portptr = NULL;

  }

  else

    portptr = strchr(hostname, ':');

tests/libtest/lib1560.c

+9 −0
Original line number Diff line number Diff line
@@ -128,6 +128,15 @@ struct querycase { 
};



static struct testcase get_parts_list[] ={

  {"http://[fd00:a41::50]:8080",

   "http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",

   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},

  {"http://[fd00:a41::50]/",

   "http | [11] | [12] | [13] | [fd00:a41::50] | [15] | / | [16] | [17]",

   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},

  {"http://[fd00:a41::50]",

   "http | [11] | [12] | [13] | [fd00:a41::50] | [15] | / | [16] | [17]",

   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},

  {"https://[::1%252]:1234",

   "https | [11] | [12] | [13] | [::1%252] | 1234 | / | [16] | [17]",

   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},