diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-01-13 17:51:12 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-01-13 17:51:12 +0000 |
commit | f19a4fc94119064bbbd359875d0030214226fef6 (patch) | |
tree | a982846af4df1ff0148c319b77bd7779f8be01e5 /funcs/func_logic.c | |
parent | 90f50f99dfa86524961f4b5cf91faf8a7f19f8fd (diff) |
Merged revisions 168546 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r168546 | tilghman | 2009-01-13 11:48:00 -0600 (Tue, 13 Jan 2009) | 6 lines
If either conditional is NULL, don't try copying it.
(closes issue #14226)
Reported by: caspy
Patches:
20090113__bug14226.diff.txt uploaded by Corydon76 (license 14)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@168547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_logic.c')
-rw-r--r-- | funcs/func_logic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_logic.c b/funcs/func_logic.c index e583d5439..cd4f18e9b 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -157,7 +157,7 @@ static int iftime(struct ast_channel *chan, const char *cmd, char *data, char *b if (iffalse) iffalse = ast_strip_quoted(iffalse, "\"", "\""); - ast_copy_string(buf, ast_check_timing(&timing) ? iftrue : iffalse, len); + ast_copy_string(buf, ast_check_timing(&timing) ? S_OR(iftrue, "") : S_OR(iffalse, ""), len); ast_destroy_timing(&timing); return 0; |