Skip to content
Snippets Groups Projects
Commit b21ab3f1 authored by zuul's avatar zuul Committed by Gerrit Code Review
Browse files

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

parents bda60f09 e922979d
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
res/stasis/stasis_bridge.c
+ 1
− 1
View file @ b21ab3f1
...@@ -215,6 +215,7 @@ static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel ...@@ -215,6 +215,7 @@ static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel
*/ */
return -1; return -1;
} }
ao2_cleanup(control);
/* /*
* If going into a holding bridge, default the role to participant, if * If going into a holding bridge, default the role to participant, if
...@@ -234,7 +235,6 @@ static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel ...@@ -234,7 +235,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) { if (self->allowed_capabilities & STASIS_BRIDGE_MIXING_CAPABILITIES) {
ast_bridge_channel_update_linkedids(bridge_channel, swap); ast_bridge_channel_update_linkedids(bridge_channel, swap);
if (ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) { if (ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment