From: David Vossel <dvossel@digium.com>
Date: Thu, 18 Feb 2010 21:23:48 +0000 (+0000)
Subject: fixes confbridge crash when no timing module is loaded.
X-Git-Tag: 11.0.0-beta1~3407
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb31f8b082a0b1e24a4127f20287f3ec00e71ee9;p=thirdparty%2Fasterisk.git

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



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

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 3cddc42e46..69d13a2b6a 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -99,6 +99,9 @@ static int softmix_bridge_create(struct ast_bridge *bridge)
 /*! \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;