From: Eric Vigeant Date: Wed, 2 Nov 2022 15:47:09 +0000 (-0400) Subject: cur_path: do not add '/' if homedir ends with one X-Git-Tag: curl-7_87_0~208 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c51adeb71da076c5c40a45e339e06bb4394a86b;p=thirdparty%2Fcurl.git 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 --- diff --git a/lib/curl_path.c b/lib/curl_path.c index 27ff96d1fc..f00e3ee74d 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); } }