From: Richard Mudgett Date: Thu, 14 Jul 2011 23:28:49 +0000 (+0000) Subject: Merged revisions 328302 via svnmerge from X-Git-Tag: 10.0.0-beta1~3^2~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc8daa138543b3f62169a88a604039dd0ff88fe8;p=thirdparty%2Fasterisk.git 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 fec843627f..a8d24797fd 100644 --- 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) {