diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-07 22:44:49 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-07 22:44:49 +0000 |
| commit | 1e9fb8870e9f7be0e201f0b0a2ea9b52045863cd (patch) | |
| tree | 10f81660d6c39046d3451d87acf87ddf11bed293 /channels | |
| parent | 010d6045bb705098624ade6ceb178dec18774c69 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@128797 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e8f89d9c9..f0ac68d3e 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); |