[asterisk-commits] twilson: trunk r288519 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Sep 22 18:20:27 2010
New Revision: 288519

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288519
Log:
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
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=288519&r1=288518&r2=288519
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Wed Sep 22 18:20:27 2010
@@ -568,6 +568,15 @@
 		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;
 }