Merged revisions 192700 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r192700 | file | 2009-05-06 11:35:47 -0300 (Wed, 06 May 2009) | 5 lines
  
  Fix an infinite loop with tab completion of CLI aliases that reference themselves.
  
  (closes issue #15020)
  Reported by: junky
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@192701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Joshua Colp 17 years ago
parent dcefbfc5b0
commit 173703c450

@ -98,7 +98,9 @@ static char *cli_alias_passthrough(struct ast_cli_entry *e, int cmd, struct ast_
case CLI_GENERATE:
line = a->line;
line += (strlen(alias->alias));
if (!ast_strlen_zero(a->word)) {
if (!strncmp(alias->alias, alias->real_cmd, strlen(alias->alias))) {
generator = NULL;
} else if (!ast_strlen_zero(a->word)) {
struct ast_str *real_cmd = ast_str_alloca(strlen(alias->real_cmd) + strlen(line) + 1);
ast_str_append(&real_cmd, 0, "%s%s", alias->real_cmd, line);
generator = ast_cli_generator(ast_str_buffer(real_cmd), a->word, a->n);

Loading…
Cancel
Save