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

tool_operate: exit on curl_share_setopt errors

Browse source 
Continuing when one of these has failed is fragile and error-prone.

Closes #19513
This commit is contained in:
Daniel Stenberg 2025-11-13 16:26:24 +01:00
parent f2a75a14dd
commit 75955c0851
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 58 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

95
src/tool_operate.c
View file

@ -2200,6 +2200,36 @@ static CURLcode run_all_transfers(CURLSH *share,
return result;
}
static CURLcode share_setopt(CURLSH *share, int opt)
{
CURLSHcode shres = curl_share_setopt(share, CURLSHOPT_SHARE, opt);
if(!shres || (shres == CURLSHE_NOT_BUILT_IN))
return CURLE_OK;
return CURLE_FAILED_INIT;
}
static CURLcode share_setup(CURLSH *share)
{
CURLcode result = CURLE_OK;
int i;
static int options[7] = {
CURL_LOCK_DATA_COOKIE,
CURL_LOCK_DATA_DNS,
CURL_LOCK_DATA_SSL_SESSION,
CURL_LOCK_DATA_PSL,
CURL_LOCK_DATA_HSTS,
0, /* 5 might be set below */
0
};
/* Running parallel, use the multi connection cache */
if(!global->parallel)
options[5] = CURL_LOCK_DATA_CONNECT;
for(i = 0; !result && options[i]; i++)
result = share_setopt(share, options[i]);
return result;
}
CURLcode operate(int argc, argv_item_t argv[])
{
CURLcode result = CURLE_OK;
@ -2286,51 +2316,42 @@ CURLcode operate(int argc, argv_item_t argv[])
result = CURLE_OUT_OF_MEMORY;
}
if(!result)
result = share_setup(share);
if(!result && global->ssl_sessions && feature_ssls_export)
result = tool_ssls_load(global->first, share,
global->ssl_sessions);
if(!result) {
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
curl_share_setopt(share, CURLSHOPT_SHARE,
CURL_LOCK_DATA_SSL_SESSION);
/* Running parallel, use the multi connection cache */
if(!global->parallel)
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT);
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_PSL);
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_HSTS);
/* Get the required arguments for each operation */
do {
result = get_args(operation, count++);
if(global->ssl_sessions && feature_ssls_export)
result = tool_ssls_load(global->first, share,
global->ssl_sessions);
operation = operation->next;
} while(!result && operation);
if(!result) {
/* Get the required arguments for each operation */
do {
result = get_args(operation, count++);
/* Set the current operation pointer */
global->current = global->first;
operation = operation->next;
} while(!result && operation);
/* now run! */
result = run_all_transfers(share, result);
/* Set the current operation pointer */
global->current = global->first;
/* now run! */
result = run_all_transfers(share, result);
if(global->ssl_sessions && feature_ssls_export) {
CURLcode r2 = tool_ssls_save(global->first, share,
global->ssl_sessions);
if(r2 && !result)
result = r2;
}
if(global->ssl_sessions && feature_ssls_export) {
CURLcode r2 = tool_ssls_save(global->first, share,
global->ssl_sessions);
if(r2 && !result)
result = r2;
}
}
curl_share_cleanup(share);
if(global->libcurl) {
/* Cleanup the libcurl source output */
easysrc_cleanup();
curl_share_cleanup(share);
if(global->libcurl) {
/* Cleanup the libcurl source output */
easysrc_cleanup();
/* Dump the libcurl code if previously enabled */
dumpeasysrc();
}
/* Dump the libcurl code if previously enabled */
dumpeasysrc();
}
}
else