diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 18:14:56 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 18:14:56 +0000 |
| commit | 3311ecd2c8f11a5cb7f83be944fd56e9401d3114 (patch) | |
| tree | b4df54d12ca8087a1d6e0f8d7723e2dafa1c6ae0 /main | |
| parent | 1c72131c43b6a05b88d7e1e1569670dac8af2396 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@277264 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 39296183d..a5b1b1938 100644 --- 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; } |