RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-22 13:46:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: tcpcheck: Fix double free on error path when parsing tcp/http-check

Browse Source 
When a "tcp-check" or a "http-check" rule is parsed, we try to get the
previous rule in the ruleset to get its index. We must take care to reset
the pointer on this rule in case an error is triggered later on the
parsing. Otherwise, the same rule may be released twice. For instance, it
happens with such line :

    http-check meth GET uri / ## note there is no "send" parameter

This patch must be backported as far as 2.2.
This commit is contained in:
Christopher Faulet 2021-03-12 12:00:14 +01:00
parent 77e376783e
commit cd03be73d5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tcpcheck.c
View File

@ -3708,6 +3708,7 @@ static int proxy_parse_tcpcheck(char **args, int section, struct proxy *curpx,
if (!LIST_ISEMPTY(&rs->rules)) {
chk = LIST_PREV(&rs->rules, typeof(chk), list);
index = chk->index + 1;
chk = NULL;
}
cur_arg = 1;
@ -3809,6 +3810,7 @@ static int proxy_parse_httpcheck(char **args, int section, struct proxy *curpx,
chk = LIST_PREV(&rs->rules, typeof(chk), list);
if (chk->action != TCPCHK_ACT_SEND || !(chk->send.http.flags & TCPCHK_SND_HTTP_FROM_OPT))
index = chk->index + 1;
chk = NULL;
}
if (strcmp(args[cur_arg], "connect") == 0)