upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-28 04:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUG/MINOR: cfgparse: Fix calculation of position for PARSE_ERR_TOOMANY message

Browse source 
The arguments are relative to the outline, not relative to the input line.

This patch fixes up commit 9e1758efbd which
is 2.2 only. No backport needed.
This commit is contained in:
Tim Duesterhus 2020-06-23 18:56:10 +02:00 committed by Willy Tarreau
parent f3d2c6d706
commit c17a5fac57
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cfgparse.c
View file

@ -1976,7 +1976,7 @@ next_line:
if (err & PARSE_ERR_TOOMANY) {
ha_alert("parsing [%s:%d]: too many words, truncating at word %d, position %ld: <%s>.\n",
file, linenum, MAX_LINE_ARGS, (long)(args[MAX_LINE_ARGS-1] - thisline + 1), args[MAX_LINE_ARGS-1]);
file, linenum, MAX_LINE_ARGS, (long)(args[MAX_LINE_ARGS-1] - outline + 1), args[MAX_LINE_ARGS-1]);
err_code |= ERR_ALERT | ERR_FATAL;
fatal++;
goto next_line;