From ba75cb53f60bb7a063293e15765426ea95fafe3e Mon Sep 17 00:00:00 2001 From: Emmanuel Hocdet Date: Wed, 28 Feb 2018 12:02:14 +0100 Subject: [PATCH] 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. --- src/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connection.c b/src/connection.c index 7097a6870..8ed8705d8 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1083,7 +1083,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; -- 2.11.0