diff options
author | Eric Vigeant <evigeant@gmail.com> | 2022-11-02 11:47:09 -0400 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2022-11-03 09:31:43 +0100 |
commit | 6c51adeb71da076c5c40a45e339e06bb4394a86b (patch) | |
tree | 8dd2b6416634ce2a5bdae4c13b9dfff324dee1ee /lib/curl_path.c | |
parent | 3390ef0af08bae327ff881ad8051623cbaa2d0f5 (diff) | |
download | curl-6c51adeb71da076c5c40a45e339e06bb4394a86b.tar.gz |
cur_path: do not add '/' if homedir ends with one
When using SFTP and a path relative to the user home, do not add a
trailing '/' to the user home dir if it already ends with one.
Closes #9844
Diffstat (limited to 'lib/curl_path.c')
-rw-r--r-- | lib/curl_path.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/curl_path.c b/lib/curl_path.c index 27ff96d1f..f00e3ee74 100644 --- a/lib/curl_path.c +++ b/lib/curl_path.c @@ -71,10 +71,14 @@ CURLcode Curl_getworkingpath(struct Curl_easy *data, /* It is referenced to the home directory, so strip the leading '/' */ memcpy(real_path, homedir, homelen); - real_path[homelen] = '/'; - real_path[homelen + 1] = '\0'; + /* Only add a trailing '/' if homedir does not end with one */ + if(homelen == 0 || real_path[homelen - 1] != '/') { + real_path[homelen] = '/'; + homelen++; + real_path[homelen] = '\0'; + } if(working_path_len > 3) { - memcpy(real_path + homelen + 1, working_path + 3, + memcpy(real_path + homelen, working_path + 3, 1 + working_path_len -3); } } |