summaryrefslogtreecommitdiff
path: root/main/features.c
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 15:45:47 -0500
commita63656b41975a4f77c8d953b5dc7f966332892f4 (patch)
tree74d852cbee1a1b01c2205e68f767e8970e6998bf /main/features.c
parent71dfa355403e41850fd7c4cb4228626e5d9476b9 (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 'main/features.c')
-rw-r--r--main/features.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c
index 618f91c52..7dfe4cde5 100644
--- a/main/features.c
+++ b/main/features.c
@@ -1103,7 +1103,6 @@ static int bridge_exec(struct ast_channel *chan, const char *data)
xfer_cfg ? xfer_cfg->xfersound : NULL);
ao2_cleanup(xfer_cfg);
if (bridge_add_failed) {
- ast_bridge_features_destroy(peer_features);
ast_bridge_features_cleanup(&chan_features);
ast_bridge_destroy(bridge, 0);
goto done;