From 0b2f1a8975b331630ed4bc610e8783d37c5b8e6c Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 7 Jul 2008 22:44:49 +0000 Subject: [PATCH] Merged revisions 128796 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r128796 | russell | 2008-07-07 17:42:30 -0500 (Mon, 07 Jul 2008) | 16 lines Merged revisions 128795 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r128795 | russell | 2008-07-07 17:41:48 -0500 (Mon, 07 Jul 2008) | 8 lines Fix handling of when a pvt disappears. Properly return the pvt locked and don't hold the pvt lock while destroying the ast_channel. (closes issue #13014) Reported by: jpgrayson Patches: chan_iax2_ast_iax2_new2.patch uploaded by jpgrayson (license 492) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@128797 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e8f89d9c9b..f0ac68d3e6 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4055,11 +4055,13 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability) ast_mutex_unlock(&iaxsl[callno]); tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "IAX2/%s-%d", i->host, i->callno); ast_mutex_lock(&iaxsl[callno]); - if (!iaxs[callno]) { + if (i != iaxs[callno]) { if (tmp) { + /* unlock and relock iaxsl[callno] to preserve locking order */ + ast_mutex_unlock(&iaxsl[callno]); ast_channel_free(tmp); + ast_mutex_lock(&iaxsl[callno]); } - ast_mutex_unlock(&iaxsl[callno]); return NULL; } iax2_ami_channelupdate(i);