romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 18:23:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

multi: init_do(): check result

Browse source 
Calls to `Curl_init_do()` did not check on result and missed failures to
properly and completely initialize a transfer request.

The main cause of such an init failure is the need to rewind the
READFUNCTION without a SEEKFUNCTION registered. Check the failure to
"rewind" the upload data immediately make test cases 1576 and friends
fail.

Reported-by: Travis Lane
Fixes #17139
Closes #17150
This commit is contained in:
Stefan Eissing 2025-04-23 11:24:45 +02:00 • committed by Daniel Stenberg
parent 39f5e7cb69
commit 5e95556fc2
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/multi.c
View file

@ -1560,10 +1560,15 @@ CURLMcode Curl_multi_add_perform(struct Curl_multi *multi,
rc = curl_multi_add_handle(multi, data);
if(!rc) {
struct SingleRequest *k = &data->req;
CURLcode result;
/* pass in NULL for 'conn' here since we do not want to init the
connection, only this transfer */
Curl_init_do(data, NULL);
result = Curl_init_do(data, NULL);
if(result) {
curl_multi_remove_handle(multi, data);
return CURLM_INTERNAL_ERROR;
}
/* take this handle to the perform state right away */
multistate(data, MSTATE_PERFORMING);

32
lib/url.c
View file

@ -3533,28 +3533,26 @@ static CURLcode create_conn(struct Curl_easy *data,
/* conn_protocol can only provide "old" protocols */
data->info.conn_protocol = (conn->handler->protocol) & CURLPROTO_MASK;
result = conn->handler->connect_it(data, &done);
if(result)
goto out;
/* Setup a "faked" transfer that will do nothing */
Curl_attach_connection(data, conn);
result = Curl_cpool_add(data, conn);
if(!result) {
Curl_attach_connection(data, conn);
result = Curl_cpool_add(data, conn);
/* Setup whatever necessary for a resumed transfer */
result = setup_range(data);
if(!result) {
/* Setup whatever necessary for a resumed transfer */
result = setup_range(data);
Curl_xfer_setup_nop(data);
result = Curl_init_do(data, conn);
}
if(result) {
DEBUGASSERT(conn->handler->done);
/* we ignore the return code for the protocol-specific DONE */
(void)conn->handler->done(data, result, FALSE);
goto out;
}
Curl_xfer_setup_nop(data);
}
/* since we skip do_init() */
Curl_init_do(data, conn);
if(result) {
DEBUGASSERT(conn->handler->done);
/* we ignore the return code for the protocol-specific DONE */
(void)conn->handler->done(data, result, FALSE);
}
goto out;
}
#endif
@ -3704,7 +3702,9 @@ static CURLcode create_conn(struct Curl_easy *data,
}
/* Setup and init stuff before DO starts, in preparing for the transfer. */
Curl_init_do(data, conn);
result = Curl_init_do(data, conn);
if(result)
goto out;
/*
* Setup whatever necessary for a resumed transfer