From 0c771cad1cc66da5bfbf6494588a984205640075 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 30 Oct 2012 19:20:28 +0000 Subject: [PATCH] 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@375496 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- bridges/bridge_softmix.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 7632f36ee6..0e60941faa 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 */ -- 2.47.3