mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-19 00:51:37 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: vars: Fix the set-var and unset-var converters

Browse Source 
In commit 3a4bedccc6 the variable logic was changed. Instead of
accessing variables by their name during runtime, the variable tables
are now indexed by a hash of the name. But the set-var and unset-var
converters try to access the correct variable by calculating a hash on
the sample instead of the already calculated variable hash.

It should be backported to 2.5.
This commit is contained in:
Remi Tricot-Le Breton 2021-11-26 18:08:39 +01:00 committed by Willy Tarreau
parent 008386bec4
commit bb3e80e181
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vars.c
View File

@ -460,19 +460,13 @@ static int var_unset(uint64_t name_hash, enum vars_scope scope, struct sample *s
/* Returns 0 if fails, else returns 1. */
static int smp_conv_store(const struct arg *args, struct sample *smp, void *private)
{
uint64_t seed = var_name_hash_seed;
uint64_t name_hash = XXH3(smp->data.u.str.area, smp->data.u.str.data, seed);
return var_set(name_hash, args[0].data.var.scope, smp, 0);
return var_set(args[0].data.var.name_hash, args[0].data.var.scope, smp, 0);
}
/* Returns 0 if fails, else returns 1. */
static int smp_conv_clear(const struct arg *args, struct sample *smp, void *private)
{
uint64_t seed = var_name_hash_seed;
uint64_t name_hash = XXH3(smp->data.u.str.area, smp->data.u.str.data, seed);
return var_unset(name_hash, args[0].data.var.scope, smp);
return var_unset(args[0].data.var.name_hash, args[0].data.var.scope, smp);
}
/* This functions check an argument entry and fill it with a variable