From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 3 Sep 2019 19:55:14 +0000 (+0200)
Subject: BUG/MINOR: mux-h1: Be sure to update the count before adding EOM after trailers
X-Git-Tag: v2.1-dev2~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ef7f641d8bc8de71394a84a46b70f74f30f565;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-h1: Be sure to update the count before adding EOM after trailers

Otherwise, an EOM may be added in a full buffer.

This patch must be backported to 2.0.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 90fb9e6f9c..647a44f8f1 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1476,7 +1476,7 @@ static size_t h1_process_input(struct h1c *h1c, struct buffer *buf, size_t count
 				if (!ret)
 					break;
 			}
-			if (!h1_process_eom(h1s, h1m, htx, count))
+			else if (!h1_process_eom(h1s, h1m, htx, count))
 				break;
 		}
 		else if (h1m->state == H1_MSG_DONE) {