Merge "stasis_bridge.c: Fix off-nominal stasis control ref leak." into 13

9 years ago · 89e9d2cfb8
parent e51193bf72 00a227e93d
commit 89e9d2cfb8
1 changed files with 1 additions and 1 deletions
--- a/res/stasis/stasis_bridge.c
+++ b/res/stasis/stasis_bridge.c
@ -217,6 +217,7 @@ static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel
 		 */
 		return -1;
 	}
+	ao2_cleanup(control);

 	/*
 	 * If going into a holding bridge, default the role to participant, if
@ -236,7 +237,6 @@ static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel
 		}
 	}

-	ao2_cleanup(control);
 	if (self->allowed_capabilities & STASIS_BRIDGE_MIXING_CAPABILITIES) {
 		ast_bridge_channel_update_linkedids(bridge_channel, swap);
 		if (ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {