From: Tim Duesterhus <tim@bastelstu.be>
Date: Mon, 22 Jun 2020 20:57:44 +0000 (+0200)
Subject: BUG/MINOR: cfgparse: Support configurations without newline at EOF
X-Git-Tag: v2.2-dev11~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70f58997f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cfgparse: Support configurations without newline at EOF

Fix parsing of configurations if the configuration file does not end with
an LF.

This patch fixes GitHub issue #704. It's a regression in
9e1758efbd68c8b1d27e17e2abe4444e110f3ebe which is 2.2 specific. No backport
needed.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index fdbf3a4066..4ccca14d2b 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1905,8 +1905,10 @@ next_line:
 
 		readbytes = 0;
 
-		/* kill trailing LF */
-		*(end - 1) = 0;
+		if (*(end-1) == '\n') {
+			/* kill trailing LF */
+			*(end - 1) = 0;
+		}
 
 		/* skip leading spaces */
 		while (isspace((unsigned char)*line))