diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-23 21:18:08 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-23 21:18:08 +0000 |
commit | 80107e956bfb077c41f4a73183de5f8713f92fdf (patch) | |
tree | ff4fd074977ec3a0338755315562402760183038 /funcs | |
parent | 5b1d03dfd316d5c1962498fc00b30289b88ddd67 (diff) |
closes issue #11052 -- where nothing after the ? will allow un-initialized variable values to corrupt and crash asterisk on 64-bit platforms
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@86902 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r-- | funcs/func_logic.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/funcs/func_logic.c b/funcs/func_logic.c index 0463f8e73..c5619fbfe 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -99,12 +99,19 @@ static int acf_if(struct ast_channel *chan, char *cmd, char *data, char *buf, AST_APP_ARG(iftrue); AST_APP_ARG(iffalse); ); - + args2.iftrue = args2.iffalse = NULL; /* you have to set these, because if there is nothing after the '?', + then args1.remainder will be NULL, not a pointer to a null string, and + then any garbage in args2.iffalse will not be cleared, and you'll crash. + -- and if you mod the ast_app_separate_args func instead, you'll really + mess things up badly, because the rest of everything depends on null args + for non-specified stuff. */ + AST_NONSTANDARD_APP_ARGS(args1, data, '?'); AST_NONSTANDARD_APP_ARGS(args2, args1.remainder, ':'); if (ast_strlen_zero(args1.expr) || !(args2.iftrue || args2.iffalse)) { - ast_log(LOG_WARNING, "Syntax IF(<expr>?[<true>][:<false>])\n"); + ast_log(LOG_WARNING, "Syntax IF(<expr>?[<true>][:<false>]) (expr must be non-null, and either <true> or <false> must be non-null)\n"); + ast_log(LOG_WARNING, " In this case, <expr>='%s', <true>='%s', and <false>='%s'\n", args1.expr, args2.iftrue, args2.iffalse); return -1; } |