From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 26 Feb 2018 12:43:38 +0000 (+0100)
Subject: BUG/MINOR: h2: Set the target of dbuf_wait to h2c
X-Git-Tag: v1.9-dev1~405
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929b52d8a1a5d3271fa8b92b4a6e0f148e3a1d42;p=thirdparty%2Fhaproxy.git

BUG/MINOR: h2: Set the target of dbuf_wait to h2c

In h2_get_dbuf, when the buffer allocation was failing, dbuf_wait.target was
errornously set to the connection (h2c->conn) instead of the h2 connection
descriptor (h2c).

This patch must be backported to 1.8.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 9b42d7bbe1..de05ca04af 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -277,7 +277,7 @@ static inline struct buffer *h2_get_dbuf(struct h2c *h2c)
 
 	if (likely(LIST_ISEMPTY(&h2c->dbuf_wait.list)) &&
 	    unlikely((buf = b_alloc_margin(&h2c->dbuf, 0)) == NULL)) {
-		h2c->dbuf_wait.target = h2c->conn;
+		h2c->dbuf_wait.target = h2c;
 		h2c->dbuf_wait.wakeup_cb = h2_dbuf_available;
 		HA_SPIN_LOCK(BUF_WQ_LOCK, &buffer_wq_lock);
 		LIST_ADDQ(&buffer_wq, &h2c->dbuf_wait.list);