[svn-commits] russell: branch 1.6.0 r128797 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jul  7 17:44:49 2008
New Revision: 128797

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128797
Log:
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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=128797&r1=128796&r2=128797
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Mon Jul  7 17:44:49 2008
@@ -4055,11 +4055,13 @@
 	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_unlock(&iaxsl[callno]);
+			ast_mutex_lock(&iaxsl[callno]);
+		}
 		return NULL;
 	}
 	iax2_ami_channelupdate(i);