diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 17:52:41 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-13 17:52:41 +0000 |
commit | c74e090245d4327130e492e495769d5b3b81836b (patch) | |
tree | 02b82f9b6fa3576e9bd44ded30f494a2f12c91d8 /funcs/func_logic.c | |
parent | 439efaf852141c39a8da18f7ec4aa27d23bf10c5 (diff) |
Merged revisions 168547 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r168547 | tilghman | 2009-01-13 11:51:12 -0600 (Tue, 13 Jan 2009) | 13 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@168549 f38db490-d61c-443f-a65b-d21fe96a405b
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 7fca070aa..180b6024f 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -79,7 +79,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); return 0; } |