diff options
| author | Mark Michelson <mmichelson@digium.com> | 2014-08-07 19:44:32 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2014-08-07 19:44:32 +0000 |
| commit | cb55679aedec355aefc43768bb9bb9b41cc59df5 (patch) | |
| tree | 6ffb7380da525aae41e8416ea4b6a939d34ae8fc /main/bridge.c | |
| parent | 99d0bccd350cd42941c195667a5733ca6a4368a4 (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge.c')
| -rw-r--r-- | main/bridge.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/bridge.c b/main/bridge.c index 926004bc9..66c495a0c 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -3949,8 +3949,12 @@ static void stasis_publish_data_init(struct ast_channel *to_transferee, 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); + } } /* |