]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix ConfBridge crash if no timing module loaded.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 30 Oct 2012 19:20:28 +0000 (19:20 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 30 Oct 2012 19:20:28 +0000 (19:20 +0000)
(closes issue ASTERISK-19448)
Reported by: feyfre
Patches:
      smfix.patch (license #6099) patch uploaded by feyfre
      Modified for coding guidelines.

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

bridges/bridge_softmix.c

index 7632f36ee693aed3075b56dc967259e27f9d76dc..0e60941faaab3038c068d879587c9f097ff00d0a 100644 (file)
@@ -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 */