4cb4f9d602
Daniel Stenberg
2026-04-06
Subject
cfilters: fix Curl_pollset_poll() return code mixup
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/cfilters.c+12 -3
| @@ -832,12 +832,19 @@ CURLcode Curl_conn_adjust_pollset(struct Curl_easy *data, | |
| return result; | |
| } | |
| + | /* |
| + | * Return values: |
| + | * -1 = error |
| + | * 0 = timeout |
| + | * N = number of structures with non zero revent fields |
| + | */ |
| int Curl_conn_cf_poll(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| timediff_t timeout_ms) | |
| { | |
| struct easy_pollset ps; | |
| - | int result; |
| + | int rc; |
| + | CURLcode result; |
| DEBUGASSERT(cf); | |
| DEBUGASSERT(data); | |
| @@ -846,9 +853,11 @@ int Curl_conn_cf_poll(struct Curl_cfilter *cf, | |
| result = Curl_conn_cf_adjust_pollset(cf, data, &ps); | |
| if(!result) | |
| - | result = Curl_pollset_poll(data, &ps, timeout_ms); |
| + | rc = Curl_pollset_poll(data, &ps, timeout_ms); |
| + | else |
| + | rc = -1; |
| Curl_pollset_cleanup(&ps); | |
| - | return result; |
| + | return rc; |
| } | |
| void Curl_conn_get_current_host(struct Curl_easy *data, int sockindex, | |
lib/select.c+9 -3
| @@ -642,13 +642,19 @@ CURLcode Curl_pollset_set(struct Curl_easy *data, | |
| (!do_out ? CURL_POLL_OUT : 0)); | |
| } | |
| + | /* |
| + | * Return values: |
| + | * -1 = error |
| + | * 0 = timeout |
| + | * N = number of structures with non zero revent fields |
| + | */ |
| int Curl_pollset_poll(struct Curl_easy *data, | |
| struct easy_pollset *ps, | |
| timediff_t timeout_ms) | |
| { | |
| struct pollfd *pfds; | |
| unsigned int i, npfds; | |
| - | int result; |
| + | int rc; |
| (void)data; | |
| DEBUGASSERT(data); | |
| @@ -677,9 +683,9 @@ int Curl_pollset_poll(struct Curl_easy *data, | |
| } | |
| } | |
| - | result = Curl_poll(pfds, npfds, timeout_ms); |
| + | rc = Curl_poll(pfds, npfds, timeout_ms); |
| curlx_free(pfds); | |
| - | return result; |
| + | return rc; |
| } | |
| void Curl_pollset_check(struct Curl_easy *data, | |