From: Willy Tarreau <w@1wt.eu>
Date: Fri, 30 Aug 2019 13:02:22 +0000 (+0200)
Subject: BUG/MEDIUM: mux-h2/trace: fix missing braces added with traces
X-Git-Tag: v2.1-dev2~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7bbbca781e72a6c96fcaa8601637f5cfcacb920;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: mux-h2/trace: fix missing braces added with traces

Ilya reported in issue #242 that h2c_handle_priority() was having
unreachable code...  Obviously, I missed the braces around the "if",
leaving an unconditional return.

No backport is needed.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index f4ab7c6714..a815b6b112 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -2305,9 +2305,10 @@ static int h2c_handle_priority(struct h2c *h2c)
 	TRACE_ENTER(H2_EV_RX_FRAME|H2_EV_RX_PRIO, h2c->conn);
 
 	/* process full frame only */
-	if (b_data(&h2c->dbuf) < h2c->dfl)
+	if (b_data(&h2c->dbuf) < h2c->dfl) {
 		TRACE_DEVEL("leaving on missing data", H2_EV_RX_FRAME|H2_EV_RX_PRIO, h2c->conn);
 		return 0;
+	}
 
 	if (h2_get_n32(&h2c->dbuf, 0) == h2c->dsi) {
 		/* 7540#5.3 : can't depend on itself */