Le 11/01/2021 à 11:05, William Dauchy a écrit :
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 <[email protected]> --- src/sample.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sample.c b/src/sample.c index fa854632f..7e4a0d060 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;
Merged, thanks William ! -- Christopher Faulet
