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

Fix invalid module command argument count

Browse Source 
The module commands were always given the maximum argument count even if
less arguments were given.
This commit is contained in:
Markus Mäkelä
2017-08-08 06:53:43 +03:00
parent d09e0d03bc
commit 9847b36a12
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/modulecmd.cc
View File

@ -519,6 +519,10 @@ MODULECMD_ARG* modulecmd_arg_parse(const MODULECMD *cmd, int argc, const void **
modulecmd_arg_free(arg); modulecmd_arg_free(arg);
arg = NULL; arg = NULL;
} }
else
{
arg->argc = argc;
}
} }
} }
else else

2
server/core/test/testmodulecmd.cc
View File

@ -206,6 +206,7 @@ int test_optional_arguments()
arg = modulecmd_arg_parse(cmd, 1, params2); arg = modulecmd_arg_parse(cmd, 1, params2);
TEST(arg, "Parsing arguments should succeed"); TEST(arg, "Parsing arguments should succeed");
TEST(arg->argc == 1, "Only one argument should be given");
TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty"); TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty");
TEST(modulecmd_call_command(cmd, arg, NULL), "Module call should be successful"); TEST(modulecmd_call_command(cmd, arg, NULL), "Module call should be successful");
TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty"); TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty");
@ -213,6 +214,7 @@ int test_optional_arguments()
arg = modulecmd_arg_parse(cmd, 0, params1); arg = modulecmd_arg_parse(cmd, 0, params1);
TEST(arg, "Parsing arguments should succeed"); TEST(arg, "Parsing arguments should succeed");
TEST(arg->argc == 0, "No arguments should be given");
TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty"); TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty");
TEST(modulecmd_call_command(cmd, arg, NULL), "Module call should be successful"); TEST(modulecmd_call_command(cmd, arg, NULL), "Module call should be successful");
TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty"); TEST(strlen(modulecmd_get_error()) == 0, "Error message should be empty");