BUG/MINOR: cfgparse: don't increment linenum on incomplete lines

When fgets() returns an incomplete line we must not increment linenum
otherwise line numbers become incorrect. This may happen when parsing
files with extremely long lines which require a realloc().

The bug has been present since unbounded line length was supported, so
the fix should be backported to older branches.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 93faf4565a0adfcaa539e6c366ddf59654f0485a..191698e2b649648def47d3bccecbaf7087561707 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1903,12 +1903,14 @@ next_line:
                                         file, linenum);
                                err_code |= ERR_ALERT | ERR_FATAL;
                                fatal++;
+                               linenum--;
                                continue;
                        }
 
                        readbytes = linesize - 1;
                        linesize = newlinesize;
                        thisline = newline;
+                       linenum--;
                        continue;
                }