[asterisk-commits] jrose: trunk r411090 - in /trunk: ./ res/res_stasis.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue Mar 25 10:56:05 2014
New Revision: 411090

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411090
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_stasis.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=411090&r1=411089&r2=411090
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Tue Mar 25 10:56:05 2014
@@ -735,7 +735,7 @@
 
 	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 @@
 		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)) {