From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Wed, 2 Oct 2024 15:04:19 +0000 (+0200)
Subject: BUG/MINOR: quic: fix trace on releasing STREAM frame after ack
X-Git-Tag: v3.1-dev9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b74df9fbc94722f37cd6bde1d517d38da9ff8aca;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: fix trace on releasing STREAM frame after ack

Fix NULL argument pass to qc_release_frm(). This allows to give more
context on the traces inside it. Note that no crash occured as QUIC
traces always check validity on first arg before derefencing it.

No backport needed.
---

diff --git a/src/quic_stream.c b/src/quic_stream.c
index 9d0b3ed8f1..e2b971c815 100644
--- a/src/quic_stream.c
+++ b/src/quic_stream.c
@@ -178,6 +178,7 @@ static struct qc_stream_buf *qc_stream_buf_ack(struct qc_stream_buf *buf,
 static void qc_stream_buf_consume(struct qc_stream_buf *stream_buf,
                                   struct qc_stream_desc *stream)
 {
+	struct quic_conn *qc = stream->qc;
 	struct eb64_node *frm_node;
 	struct qf_stream *strm_frm;
 	struct quic_frame *frm;
@@ -201,7 +202,7 @@ static void qc_stream_buf_consume(struct qc_stream_buf *stream_buf,
 		 */
 		eb64_delete(frm_node);
 		stream_buf = qc_stream_buf_ack(stream_buf, stream, offset, len, fin);
-		qc_release_frm(NULL, frm);
+		qc_release_frm(qc, frm);
 
 		frm_node = stream_buf ? eb64_first(&stream_buf->acked_frms) : NULL;
 	}