From: Jonathan Rose Date: Tue, 25 Mar 2014 15:56:05 +0000 (+0000) Subject: ARI: Resolve a subscription leak against implicit bridge subscriptions X-Git-Tag: 13.0.0-beta1~408 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0a982f8c485b9a205f3bcf775ded7837a0fae4;p=thirdparty%2Fasterisk.git ARI: Resolve a subscription leak against implicit bridge subscriptions When a channel in a stasis application is joined to a bridge, a subscription for that bridge is created implicitly for the stasis application serving the channel. Prior to this patch, subsequent removals of the channel from the bridge would leave the subscription open. Review: https://reviewboard.asterisk.org/r/3380/ ........ Merged revisions 411086 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411090 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_stasis.c b/res/res_stasis.c index 47cca03a5b..251c74420f 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -735,7 +735,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc, RAII_VAR(struct stasis_app *, app, NULL, ao2_cleanup); RAII_VAR(struct stasis_app_control *, control, NULL, control_unlink); - struct ast_bridge *last_bridge = NULL; + struct ast_bridge *bridge = NULL; int res = 0; ast_assert(chan != NULL); @@ -777,7 +777,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc, RAII_VAR(struct ast_frame *, f, NULL, ast_frame_dtor); int r; int command_count; - struct ast_bridge *bridge = NULL; + struct ast_bridge *last_bridge; /* Check to see if a bridge absorbed our hangup frame */ if (ast_check_hangup_locked(chan)) {