aboutsummaryrefslogtreecommitdiffstats
path: root/bridges
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 21:23:48 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 21:23:48 +0000
commit17b2ab71ca1711b44bac77a9780234cc19f11c42 (patch)
treee351eec7c6144660c6931a21ab0850b4a8b85d39 /bridges
parent406ad5980ef5c8200037e9d06132ad2eb4601f9e (diff)
fixes confbridge crash when no timing module is loaded.
(closes issue #16471) Reported by: kjotte Patches: M16471.diff uploaded by junky (license 177) Tested by: kjotte, junky git-svn-id: http://svn.digium.com/svn/asterisk/trunk@247770 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_softmix.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 3cddc42e4..69d13a2b6 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -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;