diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-11-08 04:59:24 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-08 04:59:24 -0600 |
| commit | 3019dfd49f115c79d4b307e328220e7ed4bbca59 (patch) | |
| tree | 26df46b88ae6ec24032337066137ca12127eaa52 /res/res_stasis.c | |
| parent | dbbd1b883423b8ad4b31b53dbca09bd058ef093f (diff) | |
| parent | d30415bfa15989ae0477e374d37daae9694d7ad4 (diff) | |
Merge "res_stasis: Don't unsubscribe from a NULL bridge."
Diffstat (limited to 'res/res_stasis.c')
| -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 54f65150e..24c2b6598 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -1328,7 +1328,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); } @@ -1389,7 +1391,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 */ |