From: Tim Duesterhus <tim@bastelstu.be>
Date: Tue, 23 Jun 2020 16:56:10 +0000 (+0200)
Subject: BUG/MINOR: cfgparse: Fix calculation of position for PARSE_ERR_TOOMANY message
X-Git-Tag: v2.2-dev11~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c17a5fac5742060c591d65858616ac11cfb4f3c9;p=thirdparty%2Fhaproxy.git

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

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

This patch fixes up commit 9e1758efbd68c8b1d27e17e2abe4444e110f3ebe which
is 2.2 only. No backport needed.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 2dc70c8449..93faf4565a 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -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;