kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARI: Fix a crash caused by hanging during playback to a channel in a bridge

Browse Source 
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
........

Merged revisions 421880 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@421881 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2014-08-22 16:52:51 +00:00
parent 1498ae0830
commit 33835e17a0
9 changed files with 113 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/stasis/stasis_bridge.c
View File

@@ -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);
}