[svn-commits] tilghman: trunk r277263 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 16 13:14:05 2010
New Revision: 277263

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

........
  r277261 | tilghman | 2010-07-16 13:04:11 -0500 (Fri, 16 Jul 2010) | 5 lines
  
  If variable gotten is not set, will segfault on Solaris.
  
  (closes issue #17636)
   Reported by: bklang
........

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=277263&r1=277262&r2=277263
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri Jul 16 13:14:05 2010
@@ -3060,7 +3060,7 @@
 	}
 
 	astman_start_ack(s, m);
-	astman_append(s, "Variable: %s\r\nValue: %s\r\n\r\n", varname, varval);
+	astman_append(s, "Variable: %s\r\nValue: %s\r\n\r\n", varname, S_OR(varval, ""));
 
 	return 0;
 }