summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-04-10 23:52:06 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-04-10 23:52:47 +0200
commit6874ec54161719ad56eaa44dbd3bfa517af9393b (patch)
treecb86bc205d85c4b2593d9fa76a6d607668e94982
parent8c92f7e82fcdd2fb17c90ecdfea6134d7a8a8185 (diff)
downloadcurl-bagder/revert-cve-2019-15601.tar.gz
Revert "file: on Windows, refuse paths that start with \\"bagder/revert-cve-2019-15601
This reverts commit 1b71bc532bde8621fd3260843f8197182a467ff2. Reminded-by: Chris Roberts Bug: https://curl.haxx.se/mail/archive-2020-04/0013.html
-rw-r--r--lib/file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/file.c b/lib/file.c
index 249237073..576a79463 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -136,7 +136,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
struct Curl_easy *data = conn->data;
char *real_path;
struct FILEPROTO *file = data->req.protop;
- int fd = -1;
+ int fd;
#ifdef DOS_FILESYSTEM
size_t i;
char *actual_path;
@@ -181,9 +181,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
return CURLE_URL_MALFORMAT;
}
- if(strncmp("\\\\", actual_path, 2))
- /* refuse to open path that starts with two backslashes */
- fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
+ fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
file->path = actual_path;
#else
if(memchr(real_path, 0, real_path_len)) {