diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-11 21:08:33 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-11 21:08:33 +0000 |
commit | 85d69eaaab108ed480b68decf07320393f0d231e (patch) | |
tree | 823f8ac28a4dd7edbf883e37e1686ab88ee7f8d4 /apps | |
parent | 83705e6288818604c052227265a58b0f3628008b (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@251887 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_exec.c b/apps/app_exec.c index 3b831ba6c..8efa452bb 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -229,13 +229,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'; |