From: Willy Tarreau <w@1wt.eu>
Date: Sun, 4 Oct 2009 05:36:58 +0000 (+0200)
Subject: [MINOR] stats: strip CR and LF from the input command line
X-Git-Tag: v1.4-dev4~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=816fc22a4a618bde48f6dd5e32499fa1459279b5;p=thirdparty%2Fhaproxy.git

[MINOR] stats: strip CR and LF from the input command line

commands sent from certain tools (eg: telnet) will be terminated
by CRLF and not only LF. So we must suppress CR too.
---

diff --git a/src/dumpstats.c b/src/dumpstats.c
index b34b849978..8b9593306f 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -363,13 +363,19 @@ void stats_io_handler(struct stream_interface *si)
 					break;
 				}
 
-			/* ensure we have a full line */
-			if (trash[reql-1] != '\n') {
+			/* now it is time to check that we have a full line,
+			 * remove the trailing \n and possibly \r, then cut the
+			 * line.
+			 */
+			len = reql - 1;
+			if (trash[len] != '\n') {
 				s->ana_state = STATS_ST_CLOSE;
 				continue;
 			}
 
-			len = reql - 1;
+			if (len && trash[len-1] == '\r')
+				len--;
+
 			trash[len] = '\0';
 
 			si->st0 = 1; // default to prompt