[asterisk-commits] mmichelson: trunk r389870 - /trunk/main/bridging.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue May 28 10:54:57 CDT 2013


Author: mmichelson
Date: Tue May 28 10:54:53 2013
New Revision: 389870

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389870
Log:
Add missing NULL check to acquire_bridge() function.


Modified:
    trunk/main/bridging.c

Modified: trunk/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridging.c?view=diff&rev=389870&r1=389869&r2=389870
==============================================================================
--- trunk/main/bridging.c (original)
+++ trunk/main/bridging.c Tue May 28 10:54:53 2013
@@ -5509,6 +5509,10 @@
 	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;




More information about the asterisk-commits mailing list