Fix crash when dialplan remove include is called with too few arguments.
authorWalter Doekes <walter+asterisk@wjd.nu>
Tue, 8 Nov 2011 19:29:25 +0000 (19:29 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Tue, 8 Nov 2011 19:29:25 +0000 (19:29 +0000)
"dialplan remove include x from y" crashed when the amount of arguments
was less than 6.

(closes issue ASTERISK-18762)
Reported by: Andrey Solovyev
Tested by: Andrey Solovyev
........

Merged revisions 343936 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 343944 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@343951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

pbx/pbx_config.c

index f0da2e8..91cfe04 100644 (file)
@@ -87,7 +87,7 @@ static char *handle_cli_dialplan_remove_include(struct ast_cli_entry *e, int cmd
                return complete_dialplan_remove_include(a);
        }
 
-       if (strcmp(a->argv[4], "from"))
+       if (a->argc != 6 || strcmp(a->argv[4], "from"))
                return CLI_SHOWUSAGE;
 
        if (!ast_context_remove_include(a->argv[5], a->argv[3], registrar)) {