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/branches/1.4@168546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-01-13 17:48:00 +00:00
parent b01ec2512d
commit ebe9c9c5db

View File

@@ -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;
}