[svn-commits] dvossel: trunk r316332 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue May  3 16:45:46 2011
New Revision: 316332

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316332
Log:
Merged revisions 316330 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316330 | dvossel | 2011-05-03 16:37:59 -0500 (Tue, 03 May 2011) | 24 lines
  
  Merged revisions 316329 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r316329 | dvossel | 2011-05-03 16:29:55 -0500 (Tue, 03 May 2011) | 17 lines
    
    Merged revisions 316328 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r316328 | dvossel | 2011-05-03 16:27:59 -0500 (Tue, 03 May 2011) | 10 lines
      
      Fixes chan_local crashs in local_fixup()
      
      Thanks OEJ for tracking down the issue and submitting the patch.
      
      (closes issue #19053)
      Reported by: oej
      Tested by: oej
      
      Review: https://reviewboard.asterisk.org/r/1158/
    ........
  ................
................

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=316332&r1=316331&r2=316332
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Tue May  3 16:45:46 2011
@@ -562,7 +562,7 @@
 		p->chan = newchan;
 
 	/* Do not let a masquerade cause a Local channel to be bridged to itself! */
-	if (!ast_check_hangup(newchan) && (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner)) {
+	if (!ast_check_hangup(newchan) && ((p->owner && p->owner->_bridge == p->chan) || (p->chan && p->chan->_bridge == p->owner))) {
 		ast_log(LOG_WARNING, "You can not bridge a Local channel to itself!\n");
 		ao2_unlock(p);
 		ast_queue_hangup(newchan);