fixes confbridge crash when no timing module is loaded.
authorDavid Vossel <dvossel@digium.com>
Thu, 18 Feb 2010 21:23:48 +0000 (21:23 +0000)
committerDavid Vossel <dvossel@digium.com>
Thu, 18 Feb 2010 21:23:48 +0000 (21:23 +0000)
(closes issue #16471)
Reported by: kjotte
Patches:
      M16471.diff uploaded by junky (license 177)
Tested by: kjotte, junky

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

bridges/bridge_softmix.c

index 3cddc42..69d13a2 100644 (file)
@@ -99,6 +99,9 @@ static int softmix_bridge_create(struct ast_bridge *bridge)
 /*! \brief Function called when a bridge is destroyed */
 static int softmix_bridge_destroy(struct ast_bridge *bridge)
 {
+       if (!bridge->bridge_pvt) {
+               return -1;
+       }
        ast_timer_close((struct ast_timer *) bridge->bridge_pvt);
 
        return 0;