curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 00:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

curl_path: create the new path with dynbuf

Browse Source 
Closes #10729
This commit is contained in:
Daniel Stenberg 2023-03-09 16:22:11 +01:00
parent f384d40718
commit 4e2b52b5f7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
lib/curl_path.c
View File

@ -32,70 +32,65 @@
#include "escape.h" #include "escape.h"
#include "memdebug.h" #include "memdebug.h"
#define MAX_SSHPATH_LEN 100000 /* arbitrary */
/* figure out the path to work with in this particular request */ /* figure out the path to work with in this particular request */
CURLcode Curl_getworkingpath(struct Curl_easy *data, CURLcode Curl_getworkingpath(struct Curl_easy *data,
char *homedir, /* when SFTP is used */ char *homedir, /* when SFTP is used */
char **path) /* returns the allocated char **path) /* returns the allocated
real path to work with */ real path to work with */
{ {
char *real_path = NULL;
char *working_path; char *working_path;
size_t working_path_len; size_t working_path_len;
struct dynbuf npath;
CURLcode result = CURLcode result =
Curl_urldecode(data->state.up.path, 0, &working_path, Curl_urldecode(data->state.up.path, 0, &working_path,
&working_path_len, REJECT_ZERO); &working_path_len, REJECT_ZERO);
if(result) if(result)
return result; return result;
/* new path to switch to in case we need to */
Curl_dyn_init(&npath, MAX_SSHPATH_LEN);
/* Check for /~/, indicating relative to the user's home directory */ /* Check for /~/, indicating relative to the user's home directory */
if(data->conn->handler->protocol & CURLPROTO_SCP) { if((data->conn->handler->protocol & CURLPROTO_SCP) &&
real_path = malloc(working_path_len + 1); (working_path_len > 3) && (!memcmp(working_path, "/~/", 3))) {
if(!real_path) { /* It is referenced to the home directory, so strip the leading '/~/' */
if(Curl_dyn_addn(&npath, &working_path[3], working_path_len - 3)) {
free(working_path); free(working_path);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
if((working_path_len > 3) && (!memcmp(working_path, "/~/", 3)))
/* It is referenced to the home directory, so strip the leading '/~/' */
memcpy(real_path, working_path + 3, working_path_len - 2);
else
memcpy(real_path, working_path, 1 + working_path_len);
} }
else if(data->conn->handler->protocol & CURLPROTO_SFTP) { else if((data->conn->handler->protocol & CURLPROTO_SFTP) &&
if((working_path_len > 1) && (working_path[1] == '~')) { (working_path_len > 2) && !memcmp(working_path, "/~/", 3)) {
size_t homelen = strlen(homedir); size_t len;
real_path = malloc(homelen + working_path_len + 1); const char *p;
if(!real_path) { int copyfrom = 3;
free(working_path); if(Curl_dyn_add(&npath, homedir)) {
return CURLE_OUT_OF_MEMORY; free(working_path);
} return CURLE_OUT_OF_MEMORY;
/* It is referenced to the home directory, so strip the
leading '/' */
memcpy(real_path, homedir, homelen);
/* 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, working_path + 3,
1 + working_path_len -3);
}
} }
else { /* Copy a separating '/' if homedir does not end with one */
real_path = malloc(working_path_len + 1); len = Curl_dyn_len(&npath);
if(!real_path) { p = Curl_dyn_ptr(&npath);
free(working_path); if(len && (p[len-1] != '/'))
return CURLE_OUT_OF_MEMORY; copyfrom = 2;
}
memcpy(real_path, working_path, 1 + working_path_len); if(Curl_dyn_addn(&npath,
&working_path[copyfrom], working_path_len - copyfrom)) {
free(working_path);
return CURLE_OUT_OF_MEMORY;
} }
} }
free(working_path); if(Curl_dyn_len(&npath)) {
free(working_path);
/* store the pointer for the caller to receive */ /* store the pointer for the caller to receive */
*path = real_path; *path = Curl_dyn_ptr(&npath);
}
else
*path = working_path;
return CURLE_OK; return CURLE_OK;
} }