diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-10-30 19:31:02 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-10-30 19:31:02 +0000 |
| commit | 9240971cd416550d372fc6026e471f3f631a46d3 (patch) | |
| tree | 8daa8d80cfc601b9950668d1b6da906b2cddd67a /bridges | |
| parent | 1e59b210afa1135bc599c7f2306f9dd61186c970 (diff) | |
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
........
Merged revisions 375506 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375511 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 52e555117..dba0de514 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 */ |