From 44ab42e55bbe329777ee05d50aea1ee059221652 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 11 Oct 2016 00:48:35 +0200 Subject: [PATCH] urlparse: accept '#' as end of host name 'http://example.com#@127.0.0.1/x.txt' equals a request to example.com for the '/' document with the rest of the URL being a fragment. Upstream-Status: Backport CVE: CVE-2016-8624 Signed-off-by: Thiruvadi Rajaraman --- lib/url.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/url.c b/lib/url.c index 74e9bf5..ce94281 100644 --- a/lib/url.c +++ b/lib/url.c @@ -4159,11 +4159,11 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, /* clear path */ char slashbuf[4]; path[0]=0; rc = sscanf(data->change.url, - "%15[^\n:]:%3[/]%[^\n/?]%[^\n]", + "%15[^\n:]:%3[/]%[^\n/?#]%[^\n]", protobuf, slashbuf, conn->host.name, path); if(2 == rc) { failf(data, "Bad URL"); return CURLE_URL_MALFORMAT; } @@ -4171,11 +4171,11 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, /* * The URL was badly formatted, let's try the browser-style _without_ * protocol specified like 'http://'. */ - rc = sscanf(data->change.url, "%[^\n/?]%[^\n]", conn->host.name, path); + rc = sscanf(data->change.url, "%[^\n/?#]%[^\n]", conn->host.name, path); if(1 > rc) { /* * We couldn't even get this format. * djgpp 2.04 has a sscanf() bug where 'conn->host.name' is * assigned, but the return value is EOF! @@ -4276,14 +4276,14 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, strcpy(path, "/"); rebuild_url = TRUE; } /* If the URL is malformatted (missing a '/' after hostname before path) we - * insert a slash here. The only letter except '/' we accept to start a path - * is '?'. + * insert a slash here. The only letters except '/' that can start a path is + * '?' and '#' - as controlled by the two sscanf() patterns above. */ - if(path[0] == '?') { + if(path[0] != '/') { /* We need this function to deal with overlapping memory areas. We know that the memory area 'path' points to is 'urllen' bytes big and that is bigger than the path. Use +1 to move the zero byte too. */ memmove(&path[1], path, strlen(path)+1); path[0] = '/'; -- 2.9.3