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

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

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