romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-08 12:27:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

http: avoid two strdup()s and do minor simplifications

Browse source 
Closes #19571
This commit is contained in:
Daniel Stenberg 2025-11-17 13:54:24 +01:00
parent 142fd1cf32
commit b360fc62fb
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/http.c
View file

@ -4587,15 +4587,12 @@ static CURLcode req_assign_url_authority(struct httpreq *req, CURLU *url)
if(result)
goto out;
}
req->authority = strdup(curlx_dyn_ptr(&buf));
if(!req->authority)
goto out;
result = CURLE_OK;
req->authority = curlx_dyn_ptr(&buf);
out:
free(host);
free(port);
curlx_dyn_free(&buf);
if(result)
curlx_dyn_free(&buf);
return result;
}
@ -4609,41 +4606,32 @@ static CURLcode req_assign_url_path(struct httpreq *req, CURLU *url)
path = query = NULL;
curlx_dyn_init(&buf, DYN_HTTP_REQUEST);
uc = curl_url_get(url, CURLUPART_PATH, &path, CURLU_PATH_AS_IS);
uc = curl_url_get(url, CURLUPART_PATH, &path, 0);
if(uc)
goto out;
uc = curl_url_get(url, CURLUPART_QUERY, &query, 0);
if(uc && uc != CURLUE_NO_QUERY)
goto out;
if(!path && !query) {
req->path = NULL;
}
else if(path && !query) {
if(!query) {
req->path = path;
path = NULL;
}
else {
if(path) {
result = curlx_dyn_add(&buf, path);
if(result)
goto out;
}
if(query) {
result = curlx_dyn_add(&buf, path);
if(!result)
result = curlx_dyn_addf(&buf, "?%s", query);
if(result)
goto out;
}
req->path = strdup(curlx_dyn_ptr(&buf));
if(!req->path)
if(result)
goto out;
req->path = curlx_dyn_ptr(&buf);
}
result = CURLE_OK;
out:
free(path);
free(query);
curlx_dyn_free(&buf);
if(result)
curlx_dyn_free(&buf);
return result;
}