mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-13 06:51:00 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: config: add a missing "ELIF_TAKE" test for ".elif" condition evaluator

Browse Source 
This missing state was causing a second elif condition to be evaluated
after a first one succeeded after a .if failed. For example in the test
below the else would be executed:

     .if    0
     .elif  1
     .elif  0
     .else
     .endif

No backport is needed, this is 2.4-only.
This commit is contained in:
Willy Tarreau 2021-05-06 08:48:09 +02:00
parent 6e647c94f2
commit f67ff02072
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cfgparse.c
View File

@ -1891,6 +1891,7 @@ next_line:
if (nested_conds[nested_cond_lvl] == NESTED_COND_IF_TAKE || if (nested_conds[nested_cond_lvl] == NESTED_COND_IF_TAKE ||
nested_conds[nested_cond_lvl] == NESTED_COND_IF_SKIP || nested_conds[nested_cond_lvl] == NESTED_COND_IF_SKIP ||
nested_conds[nested_cond_lvl] == NESTED_COND_ELIF_TAKE ||
nested_conds[nested_cond_lvl] == NESTED_COND_ELIF_SKIP) { nested_conds[nested_cond_lvl] == NESTED_COND_ELIF_SKIP) {
nested_conds[nested_cond_lvl] = NESTED_COND_ELIF_SKIP; nested_conds[nested_cond_lvl] = NESTED_COND_ELIF_SKIP;
} else if (!*args[1] || *args[1] == '0') { } else if (!*args[1] || *args[1] == '0') {