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

Merge "Bridge system: Fix memory leaks and double frees on impart failure."

Browse Source
This commit is contained in:
zuul
2016-04-25 21:08:16 -05:00
committed by Gerrit Code Review
parent 807a765cfb a63656b419
commit 811e24f595
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/bridge.c
View File

@@ -2485,6 +2485,9 @@ int ast_bridge_add_channel(struct ast_bridge *bridge, struct ast_channel *chan,
if (chan_bridge) {
struct ast_bridge_channel *bridge_channel;
/* The channel is in a bridge so it is not getting any new features. */
ast_bridge_features_destroy(features);
ast_bridge_lock_both(bridge, chan_bridge);
bridge_channel = bridge_find_channel(chan_bridge, chan);
@@ -2507,9 +2510,6 @@ int ast_bridge_add_channel(struct ast_bridge *bridge, struct ast_channel *chan,
bridge_dissolve_check_stolen(chan_bridge, bridge_channel);
ast_bridge_unlock(chan_bridge);
ast_bridge_unlock(bridge);
/* The channel was in a bridge so it is not getting any new features. */
ast_bridge_features_destroy(features);
} else {
/* Slightly less easy case. We need to yank channel A from
* where he currently is and impart him into our bridge.
@@ -2517,6 +2517,7 @@ int ast_bridge_add_channel(struct ast_bridge *bridge, struct ast_channel *chan,
yanked_chan = ast_channel_yank(chan);
if (!yanked_chan) {
ast_log(LOG_WARNING, "Could not gain control of channel %s\n", ast_channel_name(chan));
ast_bridge_features_destroy(features);
return -1;
}
if (ast_channel_state(yanked_chan) != AST_STATE_UP) {