Merged revisions 251884 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r251884 | tilghman | 2010-03-11 15:07:07 -0600 (Thu, 11 Mar 2010) | 8 lines
  
  Because ExecIf needs to reprocess arguments, it's best if we don't remove quotes during parsing.
  
  (closes issue #16905)
   Reported by: ip-rob
   Patches: 
         20100303__issue16905.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251885 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-03-11 21:08:14 +00:00
parent b5c7ee9e95
commit f175cb5e0e

View File

@@ -182,13 +182,13 @@ static int execif_exec(struct ast_channel *chan, void *data)
} else {
/* Preferred syntax */
AST_NONSTANDARD_APP_ARGS(expr, parse, '?');
AST_NONSTANDARD_RAW_ARGS(expr, parse, '?');
if (ast_strlen_zero(expr.remainder)) {
ast_log(LOG_ERROR, "Usage: ExecIf(<expr>?<appiftrue>(<args>)[:<appiffalse>(<args)])\n");
return -1;
}
AST_NONSTANDARD_APP_ARGS(apps, expr.remainder, ':');
AST_NONSTANDARD_RAW_ARGS(apps, expr.remainder, ':');
if (apps.t && (truedata = strchr(apps.t, '('))) {
*truedata++ = '\0';