[svn-commits] mmichelson: trunk r420388 - in /trunk: ./ main/bridge.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Aug  7 14:44:32 2014
New Revision: 420388

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420388
Log:
Ensure bridges exist when trying to determine bridged parties when publishing transfer information.
........

Merged revisions 420387 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/bridge.c

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

Modified: trunk/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge.c?view=diff&rev=420388&r1=420387&r2=420388
==============================================================================
--- trunk/main/bridge.c (original)
+++ trunk/main/bridge.c Thu Aug  7 14:44:32 2014
@@ -3949,8 +3949,12 @@
 		publication->to_transfer_target.bridge = to_target_bridge;
 	}
 
-	publication->transferee_channel = ast_bridge_peer(to_transferee_bridge, to_transferee);
-	publication->target_channel = ast_bridge_peer(to_target_bridge, to_transfer_target);
+	if (to_transferee_bridge) {
+		publication->transferee_channel = ast_bridge_peer(to_transferee_bridge, to_transferee);
+	}
+	if (to_target_bridge) {
+		publication->target_channel = ast_bridge_peer(to_target_bridge, to_transfer_target);
+	}
 }
 
 /*