[asterisk-commits] tilghman: trunk r236186 - in /trunk: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Dec 22 21:07:48 2009
New Revision: 236186

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=236186
Log:
Merged revisions 236184 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r236184 | tilghman | 2009-12-22 20:55:24 -0600 (Tue, 22 Dec 2009) | 4 lines
  
  If EXEC only gets a single argument, don't crash when the second is used.
  (closes issue #16504)
   Reported by: bklang
........

Modified:
    trunk/   (props changed)
    trunk/res/res_agi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_agi.c?view=diff&rev=236186&r1=236185&r2=236186
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Tue Dec 22 21:07:48 2009
@@ -2295,7 +2295,7 @@
 		if (ast_compat_res_agi && !ast_strlen_zero(argv[2])) {
 			char *compat = alloca(strlen(argv[2]) * 2 + 1), *cptr;
 			const char *vptr;
-			for (cptr = compat, vptr = argv[2]; *vptr; vptr++) {
+			for (cptr = compat, vptr = (argc == 2) ? "" : argv[2]; *vptr; vptr++) {
 				if (*vptr == ',') {
 					*cptr++ = '\\';
 					*cptr++ = ',';
@@ -2308,7 +2308,7 @@
 			*cptr = '\0';
 			res = pbx_exec(chan, app_to_exec, compat);
 		} else {
-			res = pbx_exec(chan, app_to_exec, argv[2]);
+			res = pbx_exec(chan, app_to_exec, argc == 2 ? "" : argv[2]);
 		}
 	} else {
 		ast_log(LOG_WARNING, "Could not find application (%s)\n", argv[1]);