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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@195023 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/manager.c b/main/manager.c
index 0ae71e0d70ab6b42bf3c745227f78ddad6371e11..526442fbce990f3a190f7c646d01672de1b0f843 100644 (file)
--- 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