moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

urlapi: question mark within fragment is still fragment 

The parser would check for a query part before fragment, which caused it
to do wrong when the fragment contains a question mark.

Extended test 1560 to verify.

Reported-by: Alex Konev
Fixes #4412
Closes #4413
This commit is contained in:
Daniel Stenberg 2019-09-24 14:45:27 +02:00
parent 9e78e739a5
commit 6e7733f788
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/urlapi.c
View File

@ -849,14 +849,14 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags)
if(junkscan(path))
return CURLUE_MALFORMED_INPUT;
fragment = strchr(path, '#');
if(fragment)
*fragment++ = 0;
query = strchr(path, '?');
if(query)
*query++ = 0;
fragment = strchr(query?query:path, '#');
if(fragment)
*fragment++ = 0;
if(!path[0])
/* if there's no path set, unset */
path = NULL;

20
tests/libtest/lib1560.c
View File

@ -140,6 +140,26 @@ static struct testcase get_parts_list[] ={
"file | [11] | [12] | [13] | [14] | [15] | C:\\programs\\foo | [16] | [17]",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
#endif
{"https://example.com/color/#green?no-black",
"https | [11] | [12] | [13] | example.com | [15] | /color/ | [16] | "
"green?no-black",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK },
{"https://example.com/color/#green#no-black",
"https | [11] | [12] | [13] | example.com | [15] | /color/ | [16] | "
"green#no-black",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK },
{"https://example.com/color/?green#no-black",
"https | [11] | [12] | [13] | example.com | [15] | /color/ | green | "
"no-black",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK },
{"https://example.com/#color/?green#no-black",
"https | [11] | [12] | [13] | example.com | [15] | / | [16] | "
"color/?green#no-black",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK },
{"https://example.#com/color/?green#no-black",
"https | [11] | [12] | [13] | example. | [15] | / | [16] | "
"com/color/?green#no-black",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK },
{"http://[ab.be:1]/x", "",
CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT},
{"http://[ab.be]/x", "",