From: Willy Tarreau <w@1wt.eu>
Date: Tue, 17 Dec 2019 08:00:15 +0000 (+0100)
Subject: BUG/MINOR: sample: fix the closing bracket and LF in the debug converter
X-Git-Tag: v2.2-dev1~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50603267981a002d2593bfe219e5071d66a8ea65;p=thirdparty%2Fhaproxy.git

BUG/MINOR: sample: fix the closing bracket and LF in the debug converter

The closing bracket was emitted for the "debug" converter even when the
opening one was not sent, and the new line was not always emitted. Let's
fix this. This is harmless since this converter is not built by default.
---

diff --git a/src/sample.c b/src/sample.c
index 1e4039d27b..b3d28cab55 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -1463,7 +1463,7 @@ static int sample_conv_debug(const struct arg *arg_p, struct sample *smp, void *
 
 			else {
 				/* Display the displayable chars*. */
-				fprintf(stderr, "<");
+				fputc('<', stderr);
 				for (i = 0; i < tmp.data.u.str.data; i++) {
 					if (isprint(tmp.data.u.str.area[i]))
 						fputc(tmp.data.u.str.area[i],
@@ -1471,9 +1471,10 @@ static int sample_conv_debug(const struct arg *arg_p, struct sample *smp, void *
 					else
 						fputc('.', stderr);
 				}
+				fputc('>', stderr);
 			}
-			fprintf(stderr, ">\n");
 		}
+		fputc('\n', stderr);
 	}
 	return 1;
 }