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

BUG/MINOR: spoe: Fix parsing of arguments in spoe-message section 

The array of pointers passed to sample_parse_expr was not really an array but a
pointer to pointer. So it can easily lead to a segfault during the configuration
parsing.
This commit is contained in:
Christopher Faulet 2017-02-23 22:41:09 +01:00 committed by Willy Tarreau
parent 3b386a318f
commit b0b4238825
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/flt_spoe.c
View File

@ -2947,8 +2947,9 @@ cfg_parse_spoe_message(const char *file, int linenum, char **args, int kwm)
arg->name_len = delim - args[cur_arg]; arg->name_len = delim - args[cur_arg];
delim++; delim++;
} }
arg->expr = sample_parse_expr((char*[]){delim, NULL},
arg->expr = sample_parse_expr(&delim, &idx, file, linenum, &errmsg, &curproxy->conf.args); &idx, file, linenum, &errmsg,
&curproxy->conf.args);
if (arg->expr == NULL) { if (arg->expr == NULL) {
Alert("parsing [%s:%d] : '%s': %s.\n", file, linenum, args[0], errmsg); Alert("parsing [%s:%d] : '%s': %s.\n", file, linenum, args[0], errmsg);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;