From d68da27a7f869cb3c66d0e0b52c5559f1ceb3d3b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 23 Oct 2024 08:47:21 +0200 Subject: uri: skip query/fragment parsing when dealing with file:// URIs Also, ignore invalid query/fragments (i.e. if the fragment comes before the query). Closes #1840 --- uri.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'uri.c') diff --git a/uri.c b/uri.c index 4de4bd88..e09f7a97 100644 --- a/uri.c +++ b/uri.c @@ -144,6 +144,21 @@ uri_parse(const char *uri, size_t len, const char *query_start = memchr(start, '?', left); const char *fragment_start = memchr(start, '#', left); + if (streq(*scheme, "file")) { + /* Don't try to parse query/fragment in file URIs, just treat + the remaining text as path */ + query_start = NULL; + fragment_start = NULL; + } + + else if (query_start != NULL && fragment_start != NULL && + fragment_start < query_start) + { + /* Invalid URI - for now, ignore, and treat is as part of path */ + query_start = NULL; + fragment_start = NULL; + } + size_t path_len = query_start != NULL ? query_start - start : fragment_start != NULL ? fragment_start - start : -- cgit v1.3