Merged revisions 270981 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r270981 | qwell | 2010-06-16 16:10:48 -0500 (Wed, 16 Jun 2010) | 11 lines

  Merged revisions 270980 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r270980 | qwell | 2010-06-16 16:10:09 -0500 (Wed, 16 Jun 2010) | 4 lines

    Need to lock the agent chan before access its internal bits.

    Pointed out by russellb on asterisk-dev mailing list.
  ........
................

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

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index e4706ac78c2260881813f6315856a06515728729..ddfb74ae29d7a7bb57db35efcb8bcb3082776875 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -2538,7 +2538,9 @@ static int function_agent(struct ast_channel *chan, const char *cmd, char *data,
                ast_copy_string(buf, agent->moh, len);
        else if (!strcasecmp(args.item, "channel")) {
                if (agent->chan) {
+                       ast_channel_lock(agent->chan);
                        ast_copy_string(buf, agent->chan->name, len);
+                       ast_channel_unlock(agent->chan);
                        tmp = strrchr(buf, '-');
                        if (tmp)
                                *tmp = '\0';