From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 28 May 2013 15:54:53 +0000 (+0000)
Subject: Add missing NULL check to acquire_bridge() function.
X-Git-Tag: 13.0.0-beta1~1754
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45dc10de842c9433518f71557d7124038a7d08dd;p=thirdparty%2Fasterisk.git

Add missing NULL check to acquire_bridge() function.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/bridging.c b/main/bridging.c
index 35cb85974e..2c32577c33 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;