From: Willy Tarreau <w@1wt.eu>
Date: Fri, 6 Dec 2024 17:53:19 +0000 (+0100)
Subject: BUG/MINOR: mux-h2: fix expression when detecting excess of CONTINUATION frames
X-Git-Tag: v3.2-dev1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb21db04c748a77122c118a3d526fdc058ca564f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-h2: fix expression when detecting excess of CONTINUATION frames

Latest commit f0eca8fe7 ("MINOR: mux-h2/glitches: add a description to
the H2 glitches") misplaced the optional glitch description field, with
it appearing at the end of the if () condition and always reporting
an excess of CONTINUATION frames from the first exceeding one.

This needs to be backported along with that commit once it gets backported.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index c0022226be..a91f561337 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -5954,7 +5954,7 @@ next_frame:
 	 * its counter by 100.
 	 */
 	if (unlikely(fragments > 4) && fragments > flen / 1024 && ret != 0) {
-		if (h2c_report_glitch(h2c, (fragments + 15) / 16), "too many CONTINUATION frames") {
+		if (h2c_report_glitch(h2c, (fragments + 15) / 16, "too many CONTINUATION frames")) {
 			TRACE_STATE("glitch limit reached on CONTINUATION frame", H2_EV_RX_FRAME|H2_EV_RX_HDR|H2_EV_H2C_ERR|H2_EV_PROTO_ERR, h2c->conn);
 			ret = -1;
 		}