mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: arg: report an error if an argument is larger than bufsize

Browse Source 
Commit ef21facd99 ("MEDIUM: arg: make make_arg_list() support quotes
in arguments") removed the chunk_strncpy() to fill the trash buffer
as the input is being parsed, and accidently dropped the jump to the
error path in case the argument is too large, which is now fixed.

No backport is needed, this is for 2.2. This addresses issue #502.
This commit is contained in:
Willy Tarreau 2020-02-15 14:54:28 +01:00
parent cd0d2ed6ee
commit 807aef8a14
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arg.c
View File

@ -213,6 +213,10 @@ int make_arg_list(const char *in, int len, uint64_t mask, struct arg **argp,
} }
trash.data = out - trash.area; trash.data = out - trash.area;
} }
if (len && *in)
goto buffer_err;
trash.area[trash.data] = 0; trash.area[trash.data] = 0;
arg->type = (mask >> (pos * ARGT_BITS)) & ARGT_MASK; arg->type = (mask >> (pos * ARGT_BITS)) & ARGT_MASK;