[svn-commits] tilghman: trunk r288714 - in /trunk: ./ funcs/func_strings.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Sep 24 08:55:11 2010
New Revision: 288714

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288714
Log:
Merged revisions 288713 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288713 | tilghman | 2010-09-24 08:54:17 -0500 (Fri, 24 Sep 2010) | 12 lines
  
  Merged revisions 288712 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r288712 | tilghman | 2010-09-24 08:53:30 -0500 (Fri, 24 Sep 2010) | 5 lines
    
    Solaris won't printf a NULL.
    
    (closes issue #18041)
     Reported by: asgaroth
  ........
................

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

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

Modified: trunk/funcs/func_strings.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_strings.c?view=diff&rev=288714&r1=288713&r2=288714
==============================================================================
--- trunk/funcs/func_strings.c (original)
+++ trunk/funcs/func_strings.c Fri Sep 24 08:55:11 2010
@@ -939,14 +939,14 @@
 	 * want them to be surprised by the result.  Hence, we prefer commas as the
 	 * delimiter, but we'll fall back to vertical bars if commas aren't found.
 	 */
-	ast_debug(1, "array (%s=%s)\n", var, value2);
+	ast_debug(1, "array (%s=%s)\n", var, S_OR(value2, ""));
 	AST_STANDARD_APP_ARGS(arg1, var);
 
 	AST_STANDARD_APP_ARGS(arg2, value2);
 
 	for (i = 0; i < arg1.argc; i++) {
 		ast_debug(1, "array set value (%s=%s)\n", arg1.var[i],
-				arg2.val[i]);
+				S_OR(arg2.val[i], ""));
 		if (i < arg2.argc) {
 			if (ishash) {
 				if (origvar[0] == '_') {