[asterisk-commits] tilghman: branch 1.4 r168546 - /branches/1.4/funcs/func_logic.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jan 13 11:48:00 2009
New Revision: 168546

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168546
Log:
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)

Modified:
    branches/1.4/funcs/func_logic.c

Modified: branches/1.4/funcs/func_logic.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/funcs/func_logic.c?view=diff&rev=168546&r1=168545&r2=168546
==============================================================================
--- branches/1.4/funcs/func_logic.c (original)
+++ branches/1.4/funcs/func_logic.c Tue Jan 13 11:48:00 2009
@@ -83,7 +83,7 @@
 	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;
 }