]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: mux-h1: Fix test instead a BUG_ON() in h1_send_error()
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 15 Dec 2022 08:59:50 +0000 (09:59 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 15 Dec 2022 08:59:51 +0000 (09:59 +0100)
In the previous patch (86924532db "BUG/MINOR: mux-h1: Fix test instead a
BUG_ON() in h1_send_error()"), a BUG_ON() condition was inverted by error in
h1_send_error(). The stream-connector must be NULL to be able to destroy the H1
stream.

This patch must be backported with the commit above (to 2.7).

src/mux_h1.c

index c511cfede77ff6c01725f858e3a32d3e3cdab812..fb1363bc00daaa3f0151494f6cf800e0bdf34b55 100644 (file)
@@ -2630,7 +2630,7 @@ static int h1_send_error(struct h1c *h1c)
        }
 
        if (h1c->state == H1_CS_EMBRYONIC) {
-               BUG_ON(h1c->h1s == NULL || h1s_sc(h1c->h1s) == NULL);
+               BUG_ON(h1c->h1s == NULL || h1s_sc(h1c->h1s) != NULL);
                TRACE_DEVEL("Abort embryonic H1S", H1_EV_H1C_ERR, h1c->conn, h1c->h1s);
                h1s_destroy(h1c->h1s);
        }