From 6e7733f7884e82e486971260f078f6cbcbeac552 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 24 Sep 2019 14:45:27 +0200 Subject: 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 --- lib/urlapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/urlapi.c b/lib/urlapi.c index 1334236b2..a51428404 100644 --- a/lib/urlapi.c +++ b/lib/urlapi.c @@ -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; -- cgit v1.2.3