[asterisk-commits] rmudgett: trunk r328318 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 14 18:34:43 2011
New Revision: 328318

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

................
  r328317 | rmudgett | 2011-07-14 18:28:49 -0500 (Thu, 14 Jul 2011) | 13 lines
  
  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:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.10-merged (original)
+++ branch-1.10-merged Thu Jul 14 18:34:43 2011
@@ -1,1 +1,1 @@
-/branches/1.10:1-328075,328120,328162,328207,328247
+/branches/1.10:1-328075,328120,328162,328207,328247,328317

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=328318&r1=328317&r2=328318
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul 14 18:34:43 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) {