[svn-commits] tilghman: branch 1.6.1 r235055 - in /branches/1.6.1: ./ res/res_agi.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Dec 15 09:35:41 2009
New Revision: 235055

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=235055
Log:
Merged revisions 235053 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r235053 | tilghman | 2009-12-15 09:33:49 -0600 (Tue, 15 Dec 2009) | 11 lines
  
  Merged revisions 235052 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r235052 | tilghman | 2009-12-15 09:29:24 -0600 (Tue, 15 Dec 2009) | 4 lines
    
    Mandatory argument checking
    (closes issue #16446)
     Reported by: nicchap
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_agi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_agi.c?view=diff&rev=235055&r1=235054&r2=235055
==============================================================================
--- branches/1.6.1/res/res_agi.c (original)
+++ branches/1.6.1/res/res_agi.c Tue Dec 15 09:35:41 2009
@@ -1721,6 +1721,9 @@
 
 static int handle_setmusic(struct ast_channel *chan, AGI *agi, int argc, char *argv[])
 {
+	if (argc < 3) {
+		return RESULT_SHOWUSAGE;
+	}
 	if (!strncasecmp(argv[2], "on", 2))
 		ast_moh_start(chan, argc > 3 ? argv[3] : NULL, NULL);
 	else if (!strncasecmp(argv[2], "off", 3))