summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2017-01-25 13:32:39 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-01-25 13:32:40 -0600
commitb21ab3f1cd8cec1277f46a56c4881ac7e608e114 (patch)
tree5388db7d17c4caa76290cb7fad43ba7e3ed285cd
parentbda60f09d386eaa04b964d9131f0ab4cbb454892 (diff)
parente922979d49ff6be125bbe8baf78e24ff2e9df280 (diff)
Merge "stasis_bridge.c: Fix off-nominal stasis control ref leak."
-rw-r--r--res/stasis/stasis_bridge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c
index 95e549a29..104d319cf 100644
--- a/res/stasis/stasis_bridge.c
+++ b/res/stasis/stasis_bridge.c
@@ -215,6 +215,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
@@ -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) {
ast_bridge_channel_update_linkedids(bridge_channel, swap);
if (ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {