diff options
| author | Jonathan Rose <jrose@digium.com> | 2014-08-22 16:44:21 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2014-08-22 16:44:21 +0000 |
| commit | 712907eec683f6c2e1bd8e51ae8f29a31c19a205 (patch) | |
| tree | e12bf92740a81800e9d62f8fef0708cfb98dbb3a /res/stasis/stasis_bridge.c | |
| parent | 50381d2c77dec85a480abfd8961eefb09e78e474 (diff) | |
ARI: Fix a crash caused by hanging during playback to a channel in a bridge
ASTERISK-24147 #close
Reported by: Edvin Vidmar
Review: https://reviewboard.asterisk.org/r/3908/
........
Merged revisions 421879 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/stasis/stasis_bridge.c')
| -rw-r--r-- | res/stasis/stasis_bridge.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c index 93542812f..9aef40353 100644 --- a/res/stasis/stasis_bridge.c +++ b/res/stasis/stasis_bridge.c @@ -85,7 +85,6 @@ static int add_channel_to_bridge( res = control_add_channel_to_bridge(control, chan, bridge); - ao2_cleanup(bridge); return res; } @@ -93,9 +92,8 @@ static void bridge_stasis_queue_join_action(struct ast_bridge *self, struct ast_bridge_channel *bridge_channel) { ast_channel_lock(bridge_channel->chan); - if (command_prestart_queue_command(bridge_channel->chan, add_channel_to_bridge, ao2_bump(self))) { - ao2_cleanup(self); - } + command_prestart_queue_command(bridge_channel->chan, add_channel_to_bridge, + ao2_bump(self), __ao2_cleanup); ast_channel_unlock(bridge_channel->chan); } |