upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-20 22:01:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

BUG/MINOR: pattern: do not leave a leading comma on "set" error messages

Browse source 
Commit 4f2493f355 ("BUG/MINOR: pattern: pat_ref_set: fix UAF reported by
coverity") dropped the condition to concatenate error messages and as
such introduced a leading comma in front of all of them. Then commit
911f4d93d4 ("BUG/MINOR: pattern: pat_ref_set: return 0 if err was found")
changed the behavior to stop at the first error anyway, so all the
mechanics dedicated to the concatenation of error messages is no longer
needed and we can simply return the error as-is, without inserting any
comma.

This should be backported where the patches above are backported.
This commit is contained in:
Willy Tarreau 2024-09-10 08:55:29 +02:00
parent 036ab62231
commit 9f8d9c9e8b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pattern.c
View file

@ -1776,8 +1776,10 @@ int pat_ref_set(struct pat_ref *ref, const char *key, const char *value, char **
elt = ebmb_entry(node, struct pat_ref_elt, node);
node = ebmb_next_dup(node);
if (!pat_ref_set_elt(ref, elt, value, &tmp_err)) {
memprintf(err, "%s, %s", err && *err ? *err : "", tmp_err);
ha_free(&tmp_err);
if (err)
*err = tmp_err;
else
ha_free(&tmp_err);
return 0;
}
found = 1;