From: Emeric Brun <ebrun@haproxy.com>
Date: Thu, 28 May 2020 12:21:33 +0000 (+0200)
Subject: BUG/MEDIUM: logs: fix trailing zeros on log message.
X-Git-Tag: v2.2-dev9~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa9d780119adc687e58a8b09e55780a0173b4ab4;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: logs: fix trailing zeros on log message.

This patch removes all trailing LFs and Zeros from
log messages. Previously only the last LF was removed.

It's a regression from e8ea0ae6f6 "BUG/MINOR: logs:
prevent double line returns in some events."

This should fix github issue #654
---

diff --git a/src/log.c b/src/log.c
index d69c94e04e..b4b00cfa14 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1579,8 +1579,10 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, char *pid_
 
 	dataptr = message;
 
-	/* historically some messages used to already contain the trailing LF */
-	if (size && (dataptr[size-1] == '\n'))
+	/* historically some messages used to already contain the trailing LF
+	 * or Zero. Let's remove all trailing LF or Zero
+	 */
+	while (size && ((dataptr[size-1] == '\n' || (dataptr[size-1] == 0))))
 		size--;
 
 	if (logsrv->type == LOG_TARGET_FD) {