[asterisk-commits] tilghman: branch 1.6.0 r168548 - in /branches/1.6.0: ./ funcs/func_logic.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jan 13 11:51:58 2009
New Revision: 168548

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168548
Log:
Merged revisions 168547 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168547 | tilghman | 2009-01-13 11:51:12 -0600 (Tue, 13 Jan 2009) | 13 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/funcs/func_logic.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/funcs/func_logic.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/funcs/func_logic.c?view=diff&rev=168548&r1=168547&r2=168548
==============================================================================
--- branches/1.6.0/funcs/func_logic.c (original)
+++ branches/1.6.0/funcs/func_logic.c Tue Jan 13 11:51:58 2009
@@ -79,7 +79,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;
 }