Merge pull request #921 from opensourcerouting/vty-varname-end-tkn

lib: cli: don't run off graph "pre-end"
This commit is contained in:
Quentin Young 2017-08-07 10:33:15 -04:00 committed by GitHub
commit f36f135e73

View File

@ -385,7 +385,6 @@ static void cmd_node_names(struct graph_node *gn, struct graph_node *join,
break; break;
case START_TKN: case START_TKN:
case END_TKN:
case JOIN_TKN: case JOIN_TKN:
/* "<foo|bar> WORD" -> word is not "bar" or "foo" */ /* "<foo|bar> WORD" -> word is not "bar" or "foo" */
prevname = NULL; prevname = NULL;
@ -405,6 +404,9 @@ static void cmd_node_names(struct graph_node *gn, struct graph_node *join,
cmd_token_varname_set(tailtok, jointok->varname); cmd_token_varname_set(tailtok, jointok->varname);
} }
break; break;
case END_TKN:
return;
} }
for (i = 0; i < vector_active(gn->to); i++) { for (i = 0; i < vector_active(gn->to); i++) {