]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MEDIUM: cfgparse: Emit hard error on truncated lines
authorTim Duesterhus <tim@bastelstu.be>
Tue, 18 Aug 2020 20:00:04 +0000 (22:00 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 18 Aug 2020 20:51:24 +0000 (22:51 +0200)
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 2fd5bdb439da29f15381aeb57c51327ba57674fc

src/cfgparse.c

index de82a9fd3eb4be0c7326f4ea7321210435c956d3..17db1fcae3f5e91743cd48c2f7613d6787259af2 100644 (file)
@@ -1876,11 +1876,11 @@ next_line:
                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",
-                                  file, linenum, (missing_lf + 1));
-                       err_code |= ERR_WARN;
+                       ha_alert("parsing [%s:%d]: Stray NUL character at position %d.\n",
+                                file, linenum, (missing_lf + 1));
+                       err_code |= ERR_ALERT | ERR_FATAL;
                        missing_lf = -1;
+                       break;
                }
 
                linenum++;
@@ -2086,10 +2086,9 @@ next_line:
        }
 
        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",
-                          file, linenum, (missing_lf + 1));
-               err_code |= ERR_WARN;
+               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_ALERT | ERR_FATAL;
        }
 
        if (cs && cs->post_section_parser)