kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2014-08-22 16:44:21 +00:00
parent 50381d2c77
commit 712907eec6
9 changed files with 113 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_stasis_playback.c
View File

@@ -366,21 +366,21 @@ static void play_on_channel_in_bridge(struct ast_bridge_channel *bridge_channel,
* \brief \ref RAII_VAR function to remove a playback from the global list when
* leaving scope.
*/
static void remove_from_playbacks(struct stasis_app_playback *playback)
static void remove_from_playbacks(void *data)
{
struct stasis_app_playback *playback = data;
ao2_unlink_flags(playbacks, playback,
OBJ_POINTER | OBJ_UNLINK | OBJ_NODATA);
ao2_ref(playback, -1);
}
static int play_uri(struct stasis_app_control *control,
struct ast_channel *chan, void *data)
{
RAII_VAR(struct stasis_app_playback *, playback, NULL,
remove_from_playbacks);
struct stasis_app_playback *playback = data;
struct ast_bridge *bridge;
playback = data;
if (!control) {
return -1;
}
@@ -434,7 +434,7 @@ struct stasis_app_playback *stasis_app_control_play_uri(
enum stasis_app_playback_target_type target_type,
int skipms, long offsetms, const char *id)
{
RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
struct stasis_app_playback *playback;
if (skipms < 0 || offsetms < 0) {
return NULL;
@@ -444,6 +444,9 @@ struct stasis_app_playback *stasis_app_control_play_uri(
stasis_app_control_get_channel_id(control), uri);
playback = playback_create(control, id);
if (!playback) {
return NULL;
}
if (skipms == 0) {
skipms = PLAYBACK_DEFAULT_SKIPMS;
@@ -459,11 +462,8 @@ struct stasis_app_playback *stasis_app_control_play_uri(
playback->state = STASIS_PLAYBACK_STATE_QUEUED;
playback_publish(playback);
/* A ref is kept in the playbacks container; no need to bump */
stasis_app_send_command_async(control, play_uri, playback);
stasis_app_send_command_async(control, play_uri, ao2_bump(playback), remove_from_playbacks);
/* Although this should be bumped for the caller */
ao2_ref(playback, +1);
return playback;
}