RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-06 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: pattern: a sample marked as const could be written

Browse Source 
The functions add final 0 to string if the final 0 is not set,
but don't check the flag CONST. This patch duplicates the strings
if the final zero is not set and the string is CONST.

Should be backported until 2.2 (at least)
This commit is contained in:
Thierry Fournier 2020-11-10 20:51:36 +01:00 committed by Willy Tarreau
parent 8f04e1849d
commit a68affeaa9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pattern.c
View File

@ -448,11 +448,18 @@ struct pattern *pat_match_str(struct sample *smp, struct pattern_expr *expr, int
if (smp->data.u.str.data < smp->data.u.str.size) {
/* we may have to force a trailing zero on the test pattern and
* the buffer is large enough to accommodate it.
* the buffer is large enough to accommodate it. If the flag
* CONST is set, duplicate the string
*/
prev = smp->data.u.str.area[smp->data.u.str.data];
if (prev)
smp->data.u.str.area[smp->data.u.str.data] = '\0';
if (prev) {
if (smp->flags & SMP_F_CONST) {
if (!smp_dup(smp))
return NULL;
} else {
smp->data.u.str.area[smp->data.u.str.data] = '\0';
}
}
}
else {
/* Otherwise, the sample is duplicated. A trailing zero