From: David Vossel <dvossel@digium.com>
Date: Thu, 18 Feb 2010 21:25:00 +0000 (+0000)
Subject: Merged revisions 247770 via svnmerge from
X-Git-Tag: 1.6.2.6-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb59129a87ec8805b206f8c64a589de9e3ebd6f9;p=thirdparty%2Fasterisk.git

Merged revisions 247770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247770 | dvossel | 2010-02-18 15:23:48 -0600 (Thu, 18 Feb 2010) | 9 lines

  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/branches/1.6.2@247776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index a980386608..8142e534ee 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;