dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328318 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2011-07-14 23:34:43 +00:00
parent e73cab2f3f
commit 567a2cc04c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
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) {