aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-13 17:48:00 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-13 17:48:00 +0000
commit0d2c4d15669322ca2f49b3e70c4d148f2f13a01e (patch)
tree9eede46a2a453f5bf0b00762513e5a090314af6c
parent84806582ece61aab11523a45fa3262c767501c13 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@168546 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--funcs/func_logic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index c5619fbfe..ef972c969 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -83,7 +83,7 @@ static int iftime(struct ast_channel *chan, char *cmd, char *data, char *buf,
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);
return 0;
}