diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-11-08 05:00:06 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-08 05:00:06 -0600 |
| commit | 5ad463581fa4e2c49828bfaa6c21558c5ae7b7eb (patch) | |
| tree | 2baf5881d2c9d412caa3d5af363a59690bb97363 | |
| parent | 587343815085741881553cac9bc5e3ab26a0c622 (diff) | |
| parent | cfede6a1fc6fc50a48f251eb9968621e3b4e9649 (diff) | |
Merge "res_stasis: Don't unsubscribe from a NULL bridge." into 14
| -rw-r--r-- | res/res_stasis.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/res/res_stasis.c b/res/res_stasis.c index a3a225568..fac564fd4 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -1330,7 +1330,9 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc, bridge = ao2_bump(stasis_app_get_bridge(control)); if (bridge != last_bridge) { - app_unsubscribe_bridge(app, last_bridge); + if (last_bridge) { + app_unsubscribe_bridge(app, last_bridge); + } if (bridge) { app_subscribe_bridge(app, bridge); } @@ -1391,7 +1393,9 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc, ast_bridge_depart(chan); } - app_unsubscribe_bridge(app, stasis_app_get_bridge(control)); + if (stasis_app_get_bridge(control)) { + app_unsubscribe_bridge(app, stasis_app_get_bridge(control)); + } ao2_cleanup(bridge); /* Only publish a stasis_end event if it hasn't already been published */ |