mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 06:41:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: send-proxy-v2: fix dest_len in make_tlv call

Browse Source 
Subtract already allocated size from buf_len.
This commit is contained in:
Emmanuel Hocdet 2017-10-31 18:24:05 +01:00 committed by Willy Tarreau
parent 901f75c4a6
commit 571c7ac0a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/connection.c
View File

@ -1039,7 +1039,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct server *srv, struct connec
if (conn_get_alpn(remote, &value, &value_len)) { if (conn_get_alpn(remote, &value, &value_len)) {
if ((buf_len - ret) < sizeof(struct tlv)) if ((buf_len - ret) < sizeof(struct tlv))
return 0; return 0;
ret += make_tlv(&buf[ret], buf_len, PP2_TYPE_ALPN, value_len, value); ret += make_tlv(&buf[ret], (buf_len - ret), PP2_TYPE_ALPN, value_len, value);
} }
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
@ -1081,7 +1081,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct server *srv, struct connec
if (remote && (remote->proxy_netns)) { if (remote && (remote->proxy_netns)) {
if ((buf_len - ret) < sizeof(struct tlv)) if ((buf_len - ret) < sizeof(struct tlv))
return 0; return 0;
ret += make_tlv(&buf[ret], buf_len, PP2_TYPE_NETNS, remote->proxy_netns->name_len, remote->proxy_netns->node.key); ret += make_tlv(&buf[ret], (buf_len - ret), PP2_TYPE_NETNS, remote->proxy_netns->name_len, remote->proxy_netns->node.key);
} }
#endif #endif