summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-11-22 10:11:59 +0100
committerDaniel Stenberg <daniel@haxx.se>2021-11-22 22:48:51 +0100
commit0e98d128f0f49e1c9cd890ea430cd6a63c0c0c92 (patch)
tree349211979335cdcc970e669e1dfd556b0d285780
parent45bcb2eaa78c790966f678c17482e70cca6593db (diff)
downloadcurl-bagder/short-file-url.tar.gz
urlapi: reject short file URLsbagder/short-file-url
file URLs that are 6 bytes or shorter are not complete. Return CURLUE_MALFORMED_INPUT for those. Extended test 1560 to verify. Triggered by #8041
-rw-r--r--lib/urlapi.c4
-rw-r--r--tests/libtest/lib1560.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/urlapi.c b/lib/urlapi.c
index b0bce2e7d..ff157c743 100644
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -824,6 +824,10 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags)
/* handle the file: scheme */
if(url_has_scheme && !strcmp(schemebuf, "file")) {
+ if(urllen <= 6)
+ /* file:/ is not enough to actually be a complete file: URL */
+ return CURLUE_MALFORMED_INPUT;
+
/* path has been allocated large enough to hold this */
strcpy(path, &url[5]);
diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
index de3e3109d..1cc1a60ec 100644
--- a/tests/libtest/lib1560.c
+++ b/tests/libtest/lib1560.c
@@ -267,6 +267,12 @@ static const struct testcase get_parts_list[] ={
{"file:/hello.html",
"file | [11] | [12] | [13] | [14] | [15] | /hello.html | [16] | [17]",
0, 0, CURLUE_OK},
+ {"file:/h",
+ "file | [11] | [12] | [13] | [14] | [15] | /h | [16] | [17]",
+ 0, 0, CURLUE_OK},
+ {"file:/",
+ "file | [11] | [12] | [13] | [14] | [15] | | [16] | [17]",
+ 0, 0, CURLUE_MALFORMED_INPUT},
{"file://127.0.0.1/hello.html",
"file | [11] | [12] | [13] | [14] | [15] | /hello.html | [16] | [17]",
0, 0, CURLUE_OK},