RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure cmd parsing never mis-sets the type 

Why leave the cmd.type to chance? Force it to the right value.

Signed-off-by: Jim Ramsay <i.am@jimramsay.com>
pull/195/head
Jim Ramsay 2022-11-24 02:15:08 -05:00 committed by Andri Yngvason
parent 80fd6b074e
commit 3e9aa0e3ae
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ctl-server.c
View File

@ -212,7 +212,6 @@ static struct cmd_help* cmd_help_new(json_t* args,
return NULL; return NULL;
} }
struct cmd_help* cmd = calloc(1, sizeof(*cmd)); struct cmd_help* cmd = calloc(1, sizeof(*cmd));
cmd->cmd.type = CMD_HELP;
if (command) { if (command) {
strlcpy(cmd->id, command, sizeof(cmd->id)); strlcpy(cmd->id, command, sizeof(cmd->id));
cmd->id_is_command = true; cmd->id_is_command = true;
@ -241,7 +240,6 @@ static struct cmd_set_output* cmd_set_output_new(json_t* args,
return NULL; return NULL;
} }
struct cmd_set_output* cmd = calloc(1, sizeof(*cmd)); struct cmd_set_output* cmd = calloc(1, sizeof(*cmd));
cmd->cmd.type = CMD_SET_OUTPUT;
if (target) { if (target) {
strlcpy(cmd->target, target, sizeof(cmd->target)); strlcpy(cmd->target, target, sizeof(cmd->target));
} else if (cycle) { } else if (cycle) {
@ -296,7 +294,6 @@ static struct cmd* parse_command(struct jsonipc_request* ipc,
case CMD_GET_CLIENTS: case CMD_GET_CLIENTS:
case CMD_GET_OUTPUTS: case CMD_GET_OUTPUTS:
cmd = calloc(1, sizeof(*cmd)); cmd = calloc(1, sizeof(*cmd));
cmd->type = cmd_type;
break; break;
case CMD_UNKNOWN: case CMD_UNKNOWN:
jsonipc_error_set_new(err, ENOENT, jsonipc_error_set_new(err, ENOENT,
@ -305,7 +302,9 @@ static struct cmd* parse_command(struct jsonipc_request* ipc,
jprintf("Unknown command \"%s\"", jprintf("Unknown command \"%s\"",
ipc->method), ipc->method),
"commands", list_allowed_commands())); "commands", list_allowed_commands()));
return NULL;
} }
cmd->type = cmd_type;
return cmd; return cmd;
} }