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

socks: make Curl_blockread_all return CURLcode

Browse source 
Reported in Joshua's sarif data

Closes #18635
This commit is contained in:
Daniel Stenberg 2025-09-20 14:29:44 +02:00
parent ca75476a5c
commit 2a5da01e42
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/socks.c
View file

@ -98,14 +98,14 @@ struct socks_state {
*
* This is STUPID BLOCKING behavior. Only used by the SOCKS GSSAPI functions.
*/
int Curl_blockread_all(struct Curl_cfilter *cf,
struct Curl_easy *data, /* transfer */
char *buf, /* store read data here */
size_t blen, /* space in buf */
size_t *pnread) /* amount bytes read */
CURLcode Curl_blockread_all(struct Curl_cfilter *cf,
struct Curl_easy *data,
char *buf, /* store read data here */
size_t blen, /* space in buf */
size_t *pnread) /* amount bytes read */
{
size_t nread = 0;
CURLcode err;
CURLcode result;
*pnread = 0;
for(;;) {
@ -116,21 +116,20 @@ int Curl_blockread_all(struct Curl_cfilter *cf,
}
if(!timeout_ms)
timeout_ms = TIMEDIFF_T_MAX;
if(SOCKET_READABLE(cf->conn->sock[cf->sockindex], timeout_ms) <= 0) {
return ~CURLE_OK;
}
err = Curl_conn_cf_recv(cf->next, data, buf, blen, &nread);
if(CURLE_AGAIN == err)
if(SOCKET_READABLE(cf->conn->sock[cf->sockindex], timeout_ms) <= 0)
return CURLE_OPERATION_TIMEDOUT;
result = Curl_conn_cf_recv(cf->next, data, buf, blen, &nread);
if(CURLE_AGAIN == result)
continue;
else if(err)
return (int)err;
else if(result)
return result;
if(blen == nread) {
*pnread += nread;
return CURLE_OK;
}
if(!nread) /* EOF */
return ~CURLE_OK;
return CURLE_RECV_ERROR;
buf += nread;
blen -= nread;