[PATCH v2 2/8] config: report correct line number upon error
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jun 8, 2017, 19:53 UTC
- Message-ID
- <291e8b643990aee04654b34c6f953387c3c030d4.1496951503.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1496951503.git.johannes.schindelin@gmx.de>
When get_value() parses a key/value pair, it is possible that the line number is decreased (because the \n has been consumed already) before the key/value pair is passed to the callback function, to allow for the correct line to be attributed in case of an error.
However, when git_parse_source() asks get_value() to parse the key/value pair, the error reporting is performed *after* get_value() returns.
Which means that we have to be careful not to increase the line number in get_value() after the callback function returned an error.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c index 146cb3452ad..9b88531a70d 100644 --- a/config.c +++ b/config.c @@ -604,7 +604,8 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name) */ cf->linenr--; ret = fn(name->buf, value, data); - cf->linenr++; + if (!ret) + cf->linenr++; return ret; }
-- 2.13.0.windows.1.460.g13f583bedb5