From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 18 Jun 2013 16:09:15 +0000 (+0000)
Subject: Add some safety cleanup for a failed push into a bridge.
X-Git-Tag: 13.0.0-beta1~1650
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e943dc8de37e4af4c6fe49d100e1dc1e8323a48d;p=thirdparty%2Fasterisk.git

Add some safety cleanup for a failed push into a bridge.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/bridging.c b/main/bridging.c
index 93e4ec2d80..ffe2161166 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -651,6 +651,7 @@ static int bridge_channel_push(struct ast_bridge_channel *bridge_channel)
 		|| ast_bridge_channel_establish_roles(bridge_channel)) {
 		ast_debug(1, "Bridge %s: pushing %p(%s) into bridge failed\n",
 			bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan));
+		bridge_features_remove(bridge_channel->features, AST_BRIDGE_HOOK_REMOVE_ON_PULL);
 		return -1;
 	}
 	bridge_channel->in_bridge = 1;