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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fec843627fe77ede5b4122ade7fa394ccafb4955..a8d24797fd55a57aced8272f313a4f93305d95be 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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) {