diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-04-28 20:07:37 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-04-28 20:07:37 +0000 |
| commit | f7caf4e249af1f1cecf4d318c59e762597631811 (patch) | |
| tree | 5060b162b1cccf84bf2a006495c5b7fa0e3fac72 /main/bridge.c | |
| parent | 7dd64ff993261da54d96a320ea261c32b622d9b1 (diff) | |
Bridging: Don't lock NULL bridges
When bridge locking was added for bridge snapshot creation, some
locations where bridge locking was added were not guaranteed to
actually have a bridge and locking NULL AO2 objects tends to cause
segfaults. This ensures that NULL bridges aren't locked.
........
Merged revisions 413073 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413074 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 ee1e4a8e7..d06b7b555 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -4072,9 +4072,13 @@ static void publish_blind_transfer(int is_external, enum ast_transfer_result res struct ast_bridge_channel_pair pair; pair.channel = transferer; pair.bridge = bridge; - ast_bridge_lock(bridge); + if (bridge) { + ast_bridge_lock(bridge); + } ast_bridge_publish_blind_transfer(is_external, result, &pair, context, exten); - ast_bridge_unlock(bridge); + if (bridge) { + ast_bridge_unlock(bridge); + } } enum ast_transfer_result ast_bridge_transfer_blind(int is_external, |