From: Thayne McCombs <astrothayne@gmail.com>
Date: Thu, 26 May 2022 04:58:51 +0000 (-0600)
Subject: BUG/MEDIUM: sample: Fix adjusting size in word converter
X-Git-Tag: v2.6-dev12~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a0d2176281bc59e8d81442a056495eb11c5a051;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: sample: Fix adjusting size in word converter

Adjust the size of the sample buffer before we change the "area"
pointer. Otherwise, we end up not changing the size, because the area
pointer is already the same as "start" before we compute the difference
between the two.

This is similar to the change in b28430591d18f7fda5bac2e0ea590b3a34f04601
but for the word converter instead of field.
---

diff --git a/src/sample.c b/src/sample.c
index 8a0a66b8c3..50ae76b6e5 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -2596,13 +2596,14 @@ found:
 	if (!smp->data.u.str.data)
 		return 1;
 
-	smp->data.u.str.area = start;
 
 	/* Compute remaining size if needed
            Note: smp->data.u.str.size cannot be set to 0 */
 	if (smp->data.u.str.size)
 		smp->data.u.str.size -= start - smp->data.u.str.area;
 
+	smp->data.u.str.area = start;
+
 	return 1;
 }