From: Willy Tarreau <w@1wt.eu>
Date: Tue, 11 Mar 2014 15:23:05 +0000 (+0100)
Subject: BUG/MEDIUM: compression: fix the output type of the compressor name
X-Git-Tag: v1.5-dev23~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a4e6bca60ebac272242a972d0603b1fe6ccf3f2;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: compression: fix the output type of the compressor name

smp_fetch_res_comp_algo() returns the name of the compression algorithm
in use. The output type is set to SMP_T_STR instead of SMP_T_CSTR, which
causes any transformation to be operated without a cast. Fortunately,
the current converters do not overwrite a zero-sized area, so the result
is an empty string. Fix this to have SMP_T_CSTR instead so that the cast
is always performed using a copy before any transformation is done.
---

diff --git a/src/compression.c b/src/compression.c
index 27ba4b4b0a..f42f77101f 100644
--- a/src/compression.c
+++ b/src/compression.c
@@ -628,7 +628,7 @@ smp_fetch_res_comp_algo(struct proxy *px, struct session *l4, void *l7, unsigned
 	if (!l4->comp_algo)
 		return 0;
 
-	smp->type = SMP_T_STR;
+	smp->type = SMP_T_CSTR;
 	smp->data.str.str = l4->comp_algo->name;
 	smp->data.str.len = l4->comp_algo->name_len;
 	return 1;