diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-07-07 22:42:30 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-07-07 22:42:30 +0000 |
| commit | 10cc442eb794a1b85875c681b8113d34dfb01039 (patch) | |
| tree | 5daeaa2864bb23b357e548c7e2b20d3e36aa889e /channels | |
| parent | 880a02f283fd235fd479907b6e9d7beb9bc56416 (diff) | |
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/trunk@128796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 831d6f62c..1a749b644 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4091,11 +4091,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); |