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().
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.10@328317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-07-14 23:28:49 +00:00
parent 7caa2349af
commit cc8daa1385

View File

@@ -29075,7 +29075,9 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i
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) {