diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-14 23:34:43 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-14 23:34:43 +0000 |
| commit | 567a2cc04c62038e0dae89abece069437f1c48bb (patch) | |
| tree | 39abea88af518bd8d3bc797366fa13b31cdfd033 | |
| parent | e73cab2f3f7846300e1d8a340f8261b16c718226 (diff) | |
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
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fec843627..a8d24797f 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) { |