[asterisk-commits] tilghman: trunk r168547 - in /trunk: ./ funcs/func_logic.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jan 13 11:51:12 2009
New Revision: 168547

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

Modified:
    trunk/   (props changed)
    trunk/funcs/func_logic.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/funcs/func_logic.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/funcs/func_logic.c?view=diff&rev=168547&r1=168546&r2=168547
==============================================================================
--- trunk/funcs/func_logic.c (original)
+++ trunk/funcs/func_logic.c Tue Jan 13 11:51:12 2009
@@ -157,7 +157,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);
 	ast_destroy_timing(&timing);
 
 	return 0;