summaryrefslogtreecommitdiff
path: root/channels/chan_iax2.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-05-06 20:09:18 +0000
committerJoshua Colp <jcolp@digium.com>2007-05-06 20:09:18 +0000
commit28f4727e751c20f3ad182b340a93dc73ba396265 (patch)
tree2f1ef07ba5d08bc9fedbca4a7bbbe8b1434545ca /channels/chan_iax2.c
parent3f8548bf3ba31a5e24a249f3441d77d9197a3b37 (diff)
Lock iax2 pvt structure when passing off to the AMI function, and make sure it exists. (issue #9674 reported by arabe)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r--channels/chan_iax2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index fe53030bb..a92e59c88 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3343,7 +3343,10 @@ static int iax2_answer(struct ast_channel *c)
unsigned short callno = PTR_TO_CALLNO(c->tech_pvt);
if (option_debug)
ast_log(LOG_DEBUG, "Answering IAX2 call\n");
- iax2_ami_channelupdate(c->tech_pvt);
+ ast_mutex_lock(&iaxsl[callno]);
+ if (iaxs[callno])
+ iax2_ami_channelupdate(iaxs[callno]);
+ ast_mutex_unlock(&iaxsl[callno]);
return send_command_locked(callno, AST_FRAME_CONTROL, AST_CONTROL_ANSWER, 0, NULL, 0, -1);
}