RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: config: fix leak on proxy.conn_src.bind_hdr_name 

Leak for parsing of option usesrc of the source keyword.

This can be backported to 1.8.
This commit is contained in:
Amaury Denoyelle 2021-01-26 14:35:22 +01:00 committed by Willy Tarreau
parent 6071c2d12d
commit 69c5c3ab33
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cfgparse-listen.c
View File

@ -2915,6 +2915,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
curproxy->conn_src.opts &= ~CO_SRC_TPROXY_MASK; curproxy->conn_src.opts &= ~CO_SRC_TPROXY_MASK;
curproxy->conn_src.opts |= CO_SRC_TPROXY_DYN; curproxy->conn_src.opts |= CO_SRC_TPROXY_DYN;
free(curproxy->conn_src.bind_hdr_name);
curproxy->conn_src.bind_hdr_name = calloc(1, end - name + 1); curproxy->conn_src.bind_hdr_name = calloc(1, end - name + 1);
curproxy->conn_src.bind_hdr_len = end - name; curproxy->conn_src.bind_hdr_len = end - name;
memcpy(curproxy->conn_src.bind_hdr_name, name, end - name); memcpy(curproxy->conn_src.bind_hdr_name, name, end - name);

3
src/haproxy.c
View File

@ -2503,6 +2503,9 @@ void deinit(void)
free(p->rdp_cookie_name); free(p->rdp_cookie_name);
free(p->invalid_rep); free(p->invalid_rep);
free(p->invalid_req); free(p->invalid_req);
#if defined(CONFIG_HAP_TRANSPARENT)
free(p->conn_src.bind_hdr_name);
#endif
if (p->conf.logformat_string != default_http_log_format && if (p->conf.logformat_string != default_http_log_format &&
p->conf.logformat_string != default_tcp_log_format && p->conf.logformat_string != default_tcp_log_format &&
p->conf.logformat_string != clf_http_log_format) p->conf.logformat_string != clf_http_log_format)