summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2013-05-28 15:54:53 +0000
committerMark Michelson <mmichelson@digium.com>2013-05-28 15:54:53 +0000
commit45dc10de842c9433518f71557d7124038a7d08dd (patch)
treed2e315073fe3d8b4e1371a369c1774a834a91016
parentcfe32ec1dac6d3f4a9e1052f87846c91b345997a (diff)
Add missing NULL check to acquire_bridge() function.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/bridging.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/bridging.c b/main/bridging.c
index 35cb85974..2c32577c3 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -5509,6 +5509,10 @@ static struct ast_bridge *acquire_bridge(struct ast_channel *chan)
bridge = ast_channel_get_bridge(chan);
ast_channel_unlock(chan);
+ if (!bridge) {
+ return NULL;
+ }
+
if (ast_test_flag(&bridge->feature_flags, AST_BRIDGE_FLAG_MASQUERADE_ONLY)) {
ao2_ref(bridge, -1);
bridge = NULL;