From: William Dauchy <wdauchy@gmail.com>
Date: Mon, 11 Jan 2021 10:05:58 +0000 (+0100)
Subject: BUG/MINOR: sample: check alloc_trash_chunk return value in concat()
X-Git-Tag: v2.4-dev6~71
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=e997010accdb17e70b628bc1e7c2810487d279c0;p=haproxy-2.5.git

BUG/MINOR: sample: check alloc_trash_chunk return value in concat()

like it is done in other places, check the return value of
`alloc_trash_chunk` before using it. This was detected by coverity.

this patch fixes commit 591fc3a330005c289b4705fe4cb37c4eec9f9eed
("BUG/MINOR: sample: fix concat() converter's corruption with non-string
variables"
As a consequence, this patch should be backported as far as 2.0

this should fix github issue #1039

Signed-off-by: William Dauchy <wdauchy@gmail.com>
---

diff --git a/src/sample.c b/src/sample.c
index fa85463..7e4a0d0 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -2992,6 +2992,9 @@ static int sample_conv_concat(const struct arg *arg_p, struct sample *smp, void
 	int max;
 
 	trash = alloc_trash_chunk();
+	if (!trash)
+		return 0;
+
 	trash->data = smp->data.u.str.data;
 	if (trash->data > trash->size - 1)
 		trash->data = trash->size - 1;