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

MINOR: quic: fix handling of out-of-order received STREAM frames

Browse Source 
The recent changes was not complete.
  d1c76f24fdf1cfb85e574cb1ef0c773b74bee32a
  MINOR: quic: do not modify offset node if quic_rx_strm_frm in tree

The frame length and data pointer should incremented after the data
copy. A BUG_ON statement has been added to detect an incorrect decrement
operaiton.
This commit is contained in:
Amaury Denoyelle 2022-02-21 19:08:44 +01:00
parent c0b66ca73c
commit 4323567650
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xprt_quic.c
View File

@ -2011,12 +2011,15 @@ static size_t qc_treat_rx_strm_frms(struct qcs *qcs)
ret = qc_rx_strm_frm_cpy(&qcs->rx.buf, frm);
qcs->rx.offset += ret;
total += ret;
if (frm->len) {
/* If there is remaining data in this frame
* this is because the destination buffer is full.
BUG_ON(frm->len < ret);
if (frm->len - ret > 0) {
/* Remove the frame from the tree before updating the
* offset field.
*/
eb64_delete(&frm->offset_node);
frm->offset_node.key += ret;
frm->data += ret;
frm->len -= ret;
eb64_insert(&qcs->rx.frms, &frm->offset_node);
break;