[svn-commits] wdoekes: branch 10 r343944 - in /branches/10: ./ pbx/pbx_config.c

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Tue Nov  8 13:27:10 2011
New Revision: 343944

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=343944
Log:
Fix crash when dialplan remove include is called with too few arguments.

"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

Modified:
    branches/10/   (props changed)
    branches/10/pbx/pbx_config.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/pbx/pbx_config.c?view=diff&rev=343944&r1=343943&r2=343944
==============================================================================
--- branches/10/pbx/pbx_config.c (original)
+++ branches/10/pbx/pbx_config.c Tue Nov  8 13:27:10 2011
@@ -87,7 +87,7 @@
 		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)) {