[asterisk-commits] dvossel: trunk r247770 - /trunk/bridges/bridge_softmix.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Feb 18 15:23:48 2010
New Revision: 247770

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247770
Log:
fixes confbridge crash when no timing module is loaded.

(closes issue #16471)
Reported by: kjotte
Patches:
      M16471.diff uploaded by junky (license 177)
Tested by: kjotte, junky


Modified:
    trunk/bridges/bridge_softmix.c

Modified: trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/trunk/bridges/bridge_softmix.c?view=diff&rev=247770&r1=247769&r2=247770
==============================================================================
--- trunk/bridges/bridge_softmix.c (original)
+++ trunk/bridges/bridge_softmix.c Thu Feb 18 15:23:48 2010
@@ -99,6 +99,9 @@
 /*! \brief Function called when a bridge is destroyed */
 static int softmix_bridge_destroy(struct ast_bridge *bridge)
 {
+	if (!bridge->bridge_pvt) {
+		return -1;
+	}
 	ast_timer_close((struct ast_timer *) bridge->bridge_pvt);
 
 	return 0;