kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-04 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 86902 via svnmerge from

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

........
r86902 | murf | 2007-10-23 15:18:08 -0600 (Tue, 23 Oct 2007) | 1 line

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: https://origsvn.digium.com/svn/asterisk/trunk@86903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-10-23 21:25:37 +00:00
parent 8b13d258c6
commit 4e20c42a13
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
funcs/func_logic.c
View File

@@ -101,12 +101,19 @@ static int acf_if(struct ast_channel *chan, const char *cmd, char *data, char *b
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;
}