aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 13:07:23 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 13:07:23 +0000
commit5f03d44ca4cc2dbf4915ff5bb63a84f68b9717d3 (patch)
treedbfb483de214aa3862a163ff253451cc4dacfdc9
parent26da4ad2211c814c5c7b305b7ebda87a0015ef86 (diff)
Merged revisions 195021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r195021 | russell | 2009-05-18 07:59:11 -0500 (Mon, 18 May 2009) | 12 lines Recorded merge of revisions 195020 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195020 | russell | 2009-05-18 07:57:46 -0500 (Mon, 18 May 2009) | 5 lines Don't try to unlock a bogus channel. (closes issue #15144) Reported by: cristiandimache ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@195023 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/manager.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/manager.c b/main/manager.c
index 0ae71e0d7..526442fbc 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1845,6 +1845,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
if (c) {
ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
ast_channel_free(c);
+ c = NULL;
} else
ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n");
} else