diff options
| author | Terry Wilson <twilson@digium.com> | 2010-09-22 23:20:27 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2010-09-22 23:20:27 +0000 |
| commit | 5ad9625cbf7f9f3825225e70cde717d4ad46a799 (patch) | |
| tree | 9510ff603b80d7c1303b463e354c1ec4ea0bc6d0 /channels/chan_local.c | |
| parent | a2a1ec5336d6cd9f6f93dc693a78b96dc5b11512 (diff) | |
Merged revisions 288507 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r288507 | twilson | 2010-09-22 16:18:27 -0700 (Wed, 22 Sep 2010) | 22 lines
Merged revisions 288500 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r288500 | twilson | 2010-09-22 16:10:09 -0700 (Wed, 22 Sep 2010) | 15 lines
Merged revisions 288499 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r288499 | twilson | 2010-09-22 16:00:30 -0700 (Wed, 22 Sep 2010) | 8 lines
Don't let a Local channel get bridged to itself
If a local channel gets bridged to itself, it becomes orphaned with no devices
left to actually tell it to hang up. This patch modifies local_fixup() to detect
this case and deny it.
Review: https://reviewboard.asterisk.org/r/934
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 8d309f5a7..343e41f90 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -568,6 +568,15 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) p->owner = newchan; else p->chan = newchan; + + /* Do not let a masquerade cause a Local channel to be bridged to itself! */ + if (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner) { + ast_log(LOG_WARNING, "You can not bridge a Local channel to itself!\n"); + ast_mutex_unlock(&p->lock); + ast_queue_hangup(newchan); + return -1; + } + ast_mutex_unlock(&p->lock); return 0; } |