783df22e59
Joshua Rogers
2025-10-07
Subject
vquic/ngtcp2: compare idle timeout in ms to avoid overflow
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/vquic/curl_ngtcp2.c+6 -3
| @@ -2745,9 +2745,12 @@ static bool cf_ngtcp2_conn_is_alive(struct Curl_cfilter *cf, | |
| rp = ngtcp2_conn_get_remote_transport_params(ctx->qconn); | |
| if(rp && rp->max_idle_timeout) { | |
| timediff_t idletime_ms = curlx_timediff(curlx_now(), ctx->q.last_io); | |
| - | if(idletime_ms > 0 && |
| - | ((uint64_t)idletime_ms * NGTCP2_MILLISECONDS) > rp->max_idle_timeout) |
| - | goto out; |
| + | if(idletime_ms > 0) { |
| + | uint64_t max_idle_ms = |
| + | (uint64_t)(rp->max_idle_timeout / NGTCP2_MILLISECONDS); |
| + | if((uint64_t)idletime_ms > max_idle_ms) |
| + | goto out; |
| + | } |
| } | |
| if(!cf->next || !cf->next->cft->is_alive(cf->next, data, input_pending)) | |
lib/vquic/curl_osslq.c+2 -2
| @@ -2254,8 +2254,8 @@ static bool cf_osslq_conn_is_alive(struct Curl_cfilter *cf, | |
| CURL_TRC_CF(data, cf, "negotiated idle timeout: %" FMT_PRIu64 "ms", | |
| (curl_uint64_t)idle_ms); | |
| idletime = curlx_timediff(curlx_now(), ctx->q.last_io); | |
| - | if(idle_ms != 0 && idletime > 0 && (uint64_t)idletime > idle_ms) |
| - | goto out; |
| + | if(idle_ms && idletime > 0 && (uint64_t)idletime > idle_ms) |
| + | goto out; |
| } | |
| #endif | |