denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swanctl: Fix enumeration of registered commands if MAX_COMMANDS is hit

Browse Source
This commit is contained in:
Martin Willi
2014-05-07 15:48:15 +02:00
parent 7b35c02db4
commit 250c6e3d90
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/swanctl/command.c
+3 -3
View File
@@ -80,7 +80,7 @@ static void build_opts()
memset(command_optstring, 0, sizeof(command_optstring)); memset(command_optstring, 0, sizeof(command_optstring));
if (active == help_idx) if (active == help_idx)
{ {
for (i = 0; cmds[i].cmd; i++) for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
{ {
command_opts[i].name = cmds[i].cmd; command_opts[i].name = cmds[i].cmd;
command_opts[i].val = cmds[i].op; command_opts[i].val = cmds[i].op;
@@ -218,7 +218,7 @@ int command_usage(char *error, ...)
fprintf(out, "usage:\n"); fprintf(out, "usage:\n");
if (active == help_idx) if (active == help_idx)
{ {
for (i = 0; cmds[i].cmd; i++) for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
{ {
fprintf(out, " swanctl --%-10s (-%c) %s\n", fprintf(out, " swanctl --%-10s (-%c) %s\n",
cmds[i].cmd, cmds[i].op, cmds[i].description); cmds[i].cmd, cmds[i].op, cmds[i].description);
@@ -292,7 +292,7 @@ int command_dispatch(int c, char *v[])
build_opts(); build_opts();
op = getopt_long(c, v, command_optstring, command_opts, NULL); op = getopt_long(c, v, command_optstring, command_opts, NULL);
for (i = 0; cmds[i].cmd; i++) for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
{ {
if (cmds[i].op == op) if (cmds[i].op == op)
{ {