[asterisk-commits] rmudgett: trunk r375511 - in /trunk: ./ bridges/bridge_softmix.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Oct 30 14:31:02 2012
New Revision: 375511

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375511
Log:
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

Modified:
    trunk/   (props changed)
    trunk/bridges/bridge_softmix.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/trunk/bridges/bridge_softmix.c?view=diff&rev=375511&r1=375510&r2=375511
==============================================================================
--- trunk/bridges/bridge_softmix.c (original)
+++ trunk/bridges/bridge_softmix.c Tue Oct 30 14:31:02 2012
@@ -297,7 +297,10 @@
 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 */