[svn-commits] dvossel: branch 1.4 r316328 - /branches/1.4/channels/chan_local.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue May  3 16:27:59 2011
New Revision: 316328

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316328
Log:
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:
    branches/1.4/channels/chan_local.c

Modified: branches/1.4/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=316328&r1=316327&r2=316328
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Tue May  3 16:27:59 2011
@@ -430,7 +430,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);