matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: Fix command execution npe

Browse source 
Caller may pass NULL if it does not care about what
command was matched.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2016-10-01 20:05:10 +00:00
parent 8de197ce04
commit c5bd4620b0
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/command.c
View file

@ -698,8 +698,13 @@ cmd_execute_command_real (vector vline,
{ {
struct list *argv_list; struct list *argv_list;
enum matcher_rv status; enum matcher_rv status;
struct cmd_element *matched_element = NULL;
struct graph *cmdgraph = cmd_node_graph (cmdvec, vty->node); struct graph *cmdgraph = cmd_node_graph (cmdvec, vty->node);
status = command_match (cmdgraph, vline, &argv_list, cmd); status = command_match (cmdgraph, vline, &argv_list, &matched_element);
if (cmd)
*cmd = matched_element;
// if matcher error, return corresponding CMD_ERR // if matcher error, return corresponding CMD_ERR
if (MATCHER_ERROR(status)) if (MATCHER_ERROR(status))
@ -724,10 +729,10 @@ cmd_execute_command_real (vector vline,
int argc = argv_list->count; int argc = argv_list->count;
int ret; int ret;
if ((*cmd)->daemon) if (matched_element->daemon)
ret = CMD_SUCCESS_DAEMON; ret = CMD_SUCCESS_DAEMON;
else else
ret = (*cmd)->func (*cmd, vty, argc, argv); ret = matched_element->func (matched_element, vty, argc, argv);
// delete list and cmd_token's in it // delete list and cmd_token's in it
list_delete (argv_list); list_delete (argv_list);