[asterisk-commits] file: trunk r114109 - /trunk/channels/chan_local.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Apr 14 10:36:02 2008
New Revision: 114109

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114109
Log:
During hangup it is possible for p->chan or p->owner to be NULL, so just return what the channel is bridged to instead of what they are *really* bridged to. Thanks Matt Nicholson!

Modified:
    trunk/channels/chan_local.c

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=114109&r1=114108&r2=114109
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Mon Apr 14 10:36:02 2008
@@ -183,8 +183,11 @@
 		bridged = (bridge == p->owner ? p->chan : p->owner);
 		
 		/* Now see if the opposite channel is bridged to anything */
-		if (bridged->_bridge)
+		if (!bridged) {
+			bridged = bridge;
+		} else if (bridged->_bridge) {
 			bridged = bridged->_bridge;
+		}
 	}
 
 	ast_mutex_unlock(&p->lock);