hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-3019: Fix enum value validation

Browse Source 
Also added a test case that reproduces the problem and verifies that it is
fixed.
This commit is contained in:
Markus Mäkelä
2020-06-01 20:35:22 +03:00
parent 65bfda445d
commit 922630f76f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/config.cc
View File

@ -4535,6 +4535,10 @@ bool config_param_is_valid(const MXS_MODULE_PARAM* params,
/** Either the only defined enum value is not valid /** Either the only defined enum value is not valid
* or multiple values were defined */ * or multiple values were defined */
valid = false; valid = false;
}
if (!valid)
{
break; break;
} }
} }

1
server/core/test/test_config.cc
View File

@ -91,6 +91,7 @@ int test_validity()
TEST(config_param_is_valid(params, "p5", "c,a,b", &ctx)); TEST(config_param_is_valid(params, "p5", "c,a,b", &ctx));
TEST(!config_param_is_valid(params, "p5", "d", &ctx)); TEST(!config_param_is_valid(params, "p5", "d", &ctx));
TEST(!config_param_is_valid(params, "p5", "a,d", &ctx)); TEST(!config_param_is_valid(params, "p5", "a,d", &ctx));
TEST(!config_param_is_valid(params, "p5", "d,a", &ctx));
TEST(!config_param_is_valid(params, "p5", "a,b,c,d", &ctx)); TEST(!config_param_is_valid(params, "p5", "a,b,c,d", &ctx));
/** Path parameter */ /** Path parameter */