From 343bfdb0d8442b8e019a8b4690200f87e2ecd4b3 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 13 Jan 2009 17:51:12 +0000
Subject: 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/trunk@168547 f38db490-d61c-443f-a65b-d21fe96a405b
---
 funcs/func_logic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3