mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-quic: handle null timeout

Browse Source 
Do not initialize mux task timeout if timeout client is set to 0 in the
configuration. Check for the task before queuing it in qc_io_cb() or
qc_detach().

This fix a crash when timeout client is 0 or undefined.
This commit is contained in:
Amaury Denoyelle 2022-04-21 16:29:27 +02:00
parent f3e03a4066
commit a3daaec5a6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mux_quic.c
View File

@ -1028,7 +1028,7 @@ static struct task *qc_io_cb(struct task *t, void *ctx, unsigned int status)
if (qcc_is_dead(qcc)) {
qc_release(qcc);
}
else {
else if (qcc->task) {
if (qcc_may_expire(qcc))
qcc->task->expire = tick_add(now_ms, qcc->timeout);
else
@ -1150,13 +1150,16 @@ static int qc_init(struct connection *conn, struct proxy *prx,
qcc->wait_event.events = 0;
/* haproxy timeouts */
qcc->task = NULL;
qcc->timeout = prx->timeout.client;
qcc->task = task_new_here();
if (!qcc->task)
goto fail_no_timeout_task;
qcc->task->process = qc_timeout_task;
qcc->task->context = qcc;
qcc->task->expire = tick_add(now_ms, qcc->timeout);
if (tick_isset(qcc->timeout)) {
qcc->task = task_new_here();
if (!qcc->task)
goto fail_no_timeout_task;
qcc->task->process = qc_timeout_task;
qcc->task->context = qcc;
qcc->task->expire = tick_add(now_ms, qcc->timeout);
}
if (!conn_is_back(conn)) {
if (!LIST_INLIST(&conn->stopping_list)) {
@ -1210,7 +1213,7 @@ static void qc_detach(struct conn_stream *cs)
if (qcc_is_dead(qcc)) {
qc_release(qcc);
}
else {
else if (qcc->task) {
if (qcc_may_expire(qcc))
qcc->task->expire = tick_add(now_ms, qcc->timeout);
else