diff options
author | Jason Parker <jparker@digium.com> | 2010-06-16 21:10:48 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2010-06-16 21:10:48 +0000 |
commit | 8ef2c3100a38350214d7b8c401a1a26cacc89de2 (patch) | |
tree | db29268a356ff6440bf9c0925ddbbfdcf2e5c84d /channels/chan_agent.c | |
parent | 9f1136143bad80bbd8222d8cf5856dbe363a61eb (diff) |
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/trunk@270981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_agent.c')
-rw-r--r-- | channels/chan_agent.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 02c175388..0b1590341 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2289,7 +2289,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'; |