[asterisk-commits] rmudgett: branch 1.10 r328317 - in /branches/1.10: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 14 18:28:49 2011
New Revision: 328317

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328317
Log:
Merged revisions 328302 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r328302 | rmudgett | 2011-07-14 18:12:06 -0500 (Thu, 14 Jul 2011) | 6 lines
  
  Missing SIP pvt and channel unlock in sip_set_rtp_peer().
  
  Regression introduced by -r326144.
  
  Add missing SIP pvt and channel unlock in sip_set_rtp_peer().
........

Modified:
    branches/1.10/   (props changed)
    branches/1.10/channels/chan_sip.c

Propchange: branches/1.10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/1.10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.10/channels/chan_sip.c?view=diff&rev=328317&r1=328316&r2=328317
==============================================================================
--- branches/1.10/channels/chan_sip.c (original)
+++ branches/1.10/channels/chan_sip.c Thu Jul 14 18:28:49 2011
@@ -29075,7 +29075,9 @@
 	if ((instance || vinstance || tinstance) &&
 		!ast_bridged_channel(chan) &&
 		!sip_cfg.directrtpsetup) {
-			return 0;
+		sip_pvt_unlock(p);
+		ast_channel_unlock(chan);
+		return 0;
 	}
 
 	if (p->alreadygone) {