diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-11-02 23:46:01 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-03 15:01:27 +0100 |
| commit | 226cfa8264cd979eff3fd52c0f3585ef095e7cf2 (patch) | |
| tree | 5173dac13278084a73559a974a772a021cccaa07 | |
| parent | b28094833a971870fd8c07960b3b12bf6fbbaad3 (diff) | |
| download | curl-226cfa8264cd979eff3fd52c0f3585ef095e7cf2.tar.gz | |
url: a short host name + port is not a scheme
The function identifying a leading "scheme" part of the URL considered a few
letters ending with a colon to be a scheme, making something like "short:80"
to become an unknown scheme instead of a short host name and a port number.
Extended test 1560 to verify.
Reported-by: Hagai Auro
Fixes #3220
Closes #3223
| -rw-r--r-- | lib/urlapi.c | 2 | ||||
| -rw-r--r-- | tests/libtest/lib1560.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/urlapi.c b/lib/urlapi.c index 18a6076ff..e877dc726 100644 --- a/lib/urlapi.c +++ b/lib/urlapi.c @@ -238,7 +238,7 @@ bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) #endif for(i = 0; i < buflen && url[i]; ++i) { char s = url[i]; - if(s == ':') { + if((s == ':') && (url[i + 1] == '/')) { if(buf) buf[i] = 0; return TRUE; diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index 57469a906..6557e0567 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -128,6 +128,9 @@ struct querycase { }; static struct testcase get_parts_list[] ={ + {"boing:80", + "https | [11] | [12] | [13] | boing | 80 | / | [16] | [17]", + CURLU_DEFAULT_SCHEME, 0, CURLUE_OK}, {"http://[fd00:a41::50]:8080", "http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]", CURLU_DEFAULT_SCHEME, 0, CURLUE_OK}, |