diff options
author | Russell Bryant <russell@russellbryant.com> | 2005-05-17 16:45:42 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2005-05-17 16:45:42 +0000 |
commit | 376bc46af562397e0fdf336ddde991e6c83a970e (patch) | |
tree | 1eae1a571cd813509f0b3f240f7a36fac67c22e3 /funcs/func_logic.c | |
parent | c4ebf00d48c331df98deb7a466d721b10fa93d97 (diff) |
prevent copying of NULL (bug #4307)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_logic.c')
-rwxr-xr-x | funcs/func_logic.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/funcs/func_logic.c b/funcs/func_logic.c index d20b7719f..8df1732ba 100755 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -52,12 +52,14 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data *iffalse = '\0'; iffalse++; } - } else - iffalse = ""; + } + if (expr && iftrue) { ret = ast_true(expr) ? iftrue : iffalse; - strncpy(buf, ret, len); - ret = buf; + if (ret) { + ast_copy_string(buf, ret, len); + ret = buf; + } } else { ast_log(LOG_WARNING, "Syntax $(if <expr>?[<truecond>][:<falsecond>])\n"); ret = NULL; |