From: Terry Wilson <twilson@digium.com>
Date: Wed, 22 Sep 2010 23:10:09 +0000 (+0000)
Subject: Merged revisions 288499 via svnmerge from
X-Git-Tag: 1.6.2.15-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8005ef8b08a4a17bfa615d81323ae83b9c6ead3e;p=thirdparty%2Fasterisk.git

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/branches/1.6.2@288500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 62568ca57d..835ae88def 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -531,6 +531,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;
 }