romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-04 07:14:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_operate: do not mix memory models

Browse source 
Make sure 'inputpath' only points to memory allocated by libcurl so that
curl_free works correctly.

Pointed out by Coverity

Follow-up to 859e88f653

Closes #12280
This commit is contained in:
Daniel Stenberg 2023-11-06 13:24:43 +01:00
parent ad051e1cbe
commit ba281e5c72
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tool_operate.c
View file

@ -907,11 +907,8 @@ static CURLcode ipfs_url_rewrite(CURLU *uh, const char *protocol, char **url,
curl_url_get(gatewaysurl, CURLUPART_PATH, &gatewaypath, CURLU_URLDECODE);
/* get the path from user input */
if(curl_url_get(uh, CURLUPART_PATH, &inputpath, CURLU_URLDECODE)) {
inputpath = strdup("");
if(!inputpath)
goto clean;
}
curl_url_get(uh, CURLUPART_PATH, &inputpath, CURLU_URLDECODE);
/* inputpath might be NULL or a valid pointer now */
/* set gateway parts in input url */
if(curl_url_set(uh, CURLUPART_SCHEME, gatewayscheme, CURLU_URLENCODE)) {
@ -927,16 +924,14 @@ static CURLcode ipfs_url_rewrite(CURLU *uh, const char *protocol, char **url,
}
/* if the input path is just a slash, clear it */
if(inputpath && *inputpath && strlen(inputpath) == 1) {
if(*inputpath == '/') {
*inputpath = '\0';
}
}
if(inputpath && (inputpath[0] == '/') && !inputpath[1])
*inputpath = '\0';
/* ensure the gateway path ends with a trailing slash */
ensure_trailing(&gatewaypath, '/');
pathbuffer = aprintf("%s%s/%s%s", gatewaypath, protocol, cid, inputpath);
pathbuffer = aprintf("%s%s/%s%s", gatewaypath, protocol, cid,
inputpath ? inputpath : "");
if(!pathbuffer) {
goto clean;
}