From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 15 Dec 2009 15:34:34 +0000 (+0000)
Subject: Merged revisions 235053 via svnmerge from
X-Git-Tag: 1.6.0.21-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3185123f7977f477a42e36a9fdcb33d127076a30;p=thirdparty%2Fasterisk.git

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
  ........
................


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

diff --git a/res/res_agi.c b/res/res_agi.c
index 59fafeeacb..4530e31b60 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1744,6 +1744,9 @@ static int handle_noop(struct ast_channel *chan, AGI *agi, int arg, char *argv[]
 
 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))