[svn-commits] tilghman: branch 1.6.2 r277264 - in /branches/1.6.2: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 16 13:14:56 2010
New Revision: 277264

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

................
  r277263 | tilghman | 2010-07-16 13:14:05 -0500 (Fri, 16 Jul 2010) | 12 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/manager.c

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

Modified: branches/1.6.2/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/manager.c?view=diff&rev=277264&r1=277263&r2=277264
==============================================================================
--- branches/1.6.2/main/manager.c (original)
+++ branches/1.6.2/main/manager.c Fri Jul 16 13:14:56 2010
@@ -1922,7 +1922,7 @@
 	if (c)
 		ast_channel_unlock(c);
 	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;
 }