kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 81415 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81415 | tilghman | 2007-08-31 14:16:52 -0500 (Fri, 31 Aug 2007) | 2 lines

The IF() function was not allowing true values that had embedded colons (closes issue #10613)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81431 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-09-03 03:01:31 +00:00
parent 87044d37a0
commit 314d4e6048
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
funcs/func_logic.c
View File

@@ -93,27 +93,30 @@ static int iftime(struct ast_channel *chan, const char *cmd, char *data, char *b
static int acf_if(struct ast_channel *chan, const char *cmd, char *data, char *buf,
size_t len)
{
char *expr;
char *iftrue;
char *iffalse;
AST_DECLARE_APP_ARGS(args1,
AST_APP_ARG(expr);
AST_APP_ARG(remainder);
);
AST_DECLARE_APP_ARGS(args2,
AST_APP_ARG(iftrue);
AST_APP_ARG(iffalse);
);
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
iftrue = strsep(&data, ":");
iffalse = data;
AST_NONSTANDARD_APP_ARGS(args1, data, '?');
AST_NONSTANDARD_APP_ARGS(args2, args1.remainder, ':');
if (ast_strlen_zero(expr) || !(iftrue || iffalse)) {
if (ast_strlen_zero(args1.expr) || !(args2.iftrue || args2.iffalse)) {
ast_log(LOG_WARNING, "Syntax IF(<expr>?[<true>][:<false>])\n");
return -1;
}
expr = ast_strip(expr);
if (iftrue)
iftrue = ast_strip_quoted(iftrue, "\"", "\"");
if (iffalse)
iffalse = ast_strip_quoted(iffalse, "\"", "\"");
args1.expr = ast_strip(args1.expr);
if (args2.iftrue)
args2.iftrue = ast_strip(args2.iftrue);
if (args2.iffalse)
args2.iffalse = ast_strip(args2.iffalse);
ast_copy_string(buf, pbx_checkcondition(expr) ? (S_OR(iftrue, "")) : (S_OR(iffalse, "")), len);
ast_copy_string(buf, pbx_checkcondition(args1.expr) ? (S_OR(args2.iftrue, "")) : (S_OR(args2.iffalse, "")), len);
return 0;
}