mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-02 19:16:15 +00:00
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
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user