kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zuul
2017-01-25 13:32:39 -06:00
committed by Gerrit Code Review
parent bda60f09d3 e922979d49
commit b21ab3f1cd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/stasis/stasis_bridge.c
View File

@@ -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
} }
} }
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)) {