From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 30 Oct 2012 19:23:04 +0000 (+0000)
Subject: Fix ConfBridge crash if no timing module loaded.
X-Git-Tag: 11.1.0-rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fc6b54a5d5137d4c74f00d5a231e2eb53be4e7f;p=thirdparty%2Fasterisk.git

Fix ConfBridge crash if no timing module loaded.

(closes issue ASTERISK-19448)
Reported by: feyfre
Patches:
      smfix.patch (license #6099) patch uploaded by feyfre
      Modified for coding guidelines.
........

Merged revisions 375496 from http://svn.asterisk.org/svn/asterisk/branches/10


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

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 52e5551170..dba0de5147 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -297,7 +297,10 @@ static void softmix_translate_helper_cleanup(struct softmix_translate_helper *tr
 static void softmix_bridge_data_destroy(void *obj)
 {
 	struct softmix_bridge_data *softmix_data = obj;
-	ast_timer_close(softmix_data->timer);
+
+	if (softmix_data->timer) {
+		ast_timer_close(softmix_data->timer);
+	}
 }
 
 /*! \brief Function called when a bridge is created */