From: Emmanuel Hocdet <manu@gandi.net>
Date: Wed, 28 Feb 2018 11:02:14 +0000 (+0100)
Subject: Revert "BUG/MINOR: send-proxy-v2: string size must include ('\0')"
X-Git-Tag: v1.9-dev1~400
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c0c34b6e731e3163c0644f50863deb9b7634fdc;p=thirdparty%2Fhaproxy.git

Revert "BUG/MINOR: send-proxy-v2: string size must include ('\0')"

This reverts commit 82913e4f79a1f1fb25aec84a2ce2f5f0e5ce1959.
TLV string value should not be null-terminated.

This should be backported to 1.8.
---

diff --git a/src/connection.c b/src/connection.c
index 48d7a64de3..11cc363733 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1057,7 +1057,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct server *srv, struct connec
 			tlv->client |= PP2_CLIENT_SSL;
 			value = ssl_sock_get_proto_version(remote);
 			if (value) {
-				ssl_tlv_len += make_tlv(&buf[ret+ssl_tlv_len], (buf_len - ret - ssl_tlv_len), PP2_SUBTYPE_SSL_VERSION, strlen(value)+1, value);
+				ssl_tlv_len += make_tlv(&buf[ret+ssl_tlv_len], (buf_len-ret-ssl_tlv_len), PP2_SUBTYPE_SSL_VERSION, strlen(value), value);
 			}
 			if (ssl_sock_get_cert_used_sess(remote)) {
 				tlv->client |= PP2_CLIENT_CERT_SESS;