1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
William Dauchy 2021-01-11 11:05:58 +01:00 committed by Christopher Faulet
parent aabde71332
commit e997010acc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sample.c
View File

@ -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;