From: Frederic Lecaille <flecaille@haproxy.com>
Date: Fri, 30 Aug 2024 12:25:26 +0000 (+0200)
Subject: BUG/MINOR: quic: Missing incrementation in NEW_TOKEN frame builder
X-Git-Tag: v3.1-dev7~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76c80605a6cc7880e4184c52fb1a314367410271;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: Missing incrementation in NEW_TOKEN frame builder

quic_build_new_token_frame() is the function which is called to build
a NEW_TOKEN frame into a buffer. The position pointer for this buffer
was not updated, leading the NEW_TOKEN frame to be malformed.

Must be backported as far as 2.6.
---

diff --git a/src/quic_frame.c b/src/quic_frame.c
index 41309dbfe8..8d42786e0f 100644
--- a/src/quic_frame.c
+++ b/src/quic_frame.c
@@ -485,6 +485,7 @@ static int quic_build_new_token_frame(unsigned char **pos, const unsigned char *
 		return 0;
 
 	memcpy(*pos, new_token_frm->data, new_token_frm->len);
+	*pos += new_token_frm->len;
 
 	return 1;
 }