From 22c43367210777a93c0ca311952cf7a7c946a6fc Mon Sep 17 00:00:00 2001 From: William Dauchy Date: Mon, 11 Jan 2021 11:05:58 +0100 Subject: [PATCH] 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 (cherry picked from commit e997010accdb17e70b628bc1e7c2810487d279c0) Signed-off-by: Christopher Faulet (cherry picked from commit c9656833cf765782c043f6d7b902350178a984a6) Signed-off-by: Christopher Faulet (cherry picked from commit fb12e1b14323f1f68fca89b27d0cea76b1664e4b) Signed-off-by: Christopher Faulet --- src/sample.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sample.c b/src/sample.c index e38a98e..b2f4245 100644 --- a/src/sample.c +++ b/src/sample.c @@ -2751,6 +2751,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; -- 1.7.10.4