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

MEDIUM: cfgparse: Emit hard error on truncated lines 

As announced within the emitted log message this is going to become a hard
error in 2.3. It's 2.3 time now, let's do this.

see 2fd5bdb439
This commit is contained in:
Tim Duesterhus 2020-08-18 22:00:04 +02:00 committed by Willy Tarreau
parent 8564f53812
commit f92afb732b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cfgparse.c
View File

@ -1876,11 +1876,11 @@ int readcfgfile(const char *file)
char *line = thisline;
if (missing_lf != -1) {
ha_warning("parsing [%s:%d]: Stray NUL character at position %d. "
"This will become a hard error in HAProxy 2.3.\n",
ha_alert("parsing [%s:%d]: Stray NUL character at position %d.\n",
file, linenum, (missing_lf + 1));
err_code |= ERR_WARN;
err_code |= ERR_ALERT | ERR_FATAL;
missing_lf = -1;
break;
}
linenum++;
@ -2086,10 +2086,9 @@ int readcfgfile(const char *file)
}
if (missing_lf != -1) {
ha_warning("parsing [%s:%d]: Missing LF on last line, file might have been truncated at position %d. "
"This will become a hard error in HAProxy 2.3.\n",
ha_alert("parsing [%s:%d]: Missing LF on last line, file might have been truncated at position %d.\n",
file, linenum, (missing_lf + 1));
err_code |= ERR_WARN;
err_code |= ERR_ALERT | ERR_FATAL;
}
if (cs && cs->post_section_parser)