summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2016-04-13 13:50:04 -0500
committerRichard Mudgett <rmudgett@digium.com>2016-04-22 16:44:04 -0500
commit1e93f3d7232a2a087a190a18e4a3f490a41d42d1 (patch)
tree799e6ae624b436e4f573b30ed9c800cbe5ac2356 /apps
parent5e388d41888a1e1c4061003a4a090dbe797bca7a (diff)
Bridge system: Fix memory leaks and double frees on impart failure.
You cannot reference the passed in features struct after calling ast_bridge_impart(). Even if the call fails. Change-Id: I902b88ba0d5d39520e670fb635078a367268ea21
Diffstat (limited to 'apps')
-rw-r--r--apps/confbridge/conf_chan_announce.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c
index 6596a8537..ee4660687 100644
--- a/apps/confbridge/conf_chan_announce.c
+++ b/apps/confbridge/conf_chan_announce.c
@@ -199,7 +199,6 @@ int conf_announce_channel_push(struct ast_channel *ast)
/* Impart the output channel into the bridge */
if (ast_bridge_impart(p->bridge, chan, NULL, features,
AST_BRIDGE_IMPART_CHAN_DEPARTABLE)) {
- ast_bridge_features_destroy(features);
ast_channel_unref(chan);
return -1;
}