From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 16 Jul 2010 18:14:05 +0000 (+0000)
Subject: Merged revisions 277261 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d72336e83f27c5c82bda38e8401716dd6b3a622c;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index 6203614522..e4d436903e 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3060,7 +3060,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
 	}
 
 	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;
 }