kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 04:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_queue: Crash when transferring" into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-09-19 09:15:33 -05:00
committed by Gerrit Code Review
parent 16f1598b31 6409e7b11a
commit c7beb33ebb
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_queue.c
View File

@@ -5564,6 +5564,10 @@ struct queue_stasis_data {
struct local_optimization caller_optimize; struct local_optimization caller_optimize;
/*! Local channel optimization details for the member */ /*! Local channel optimization details for the member */
struct local_optimization member_optimize; struct local_optimization member_optimize;
/*! Member channel */
struct ast_channel *member_channel;
/*! Caller channel */
struct ast_channel *caller_channel;
}; };
/*! /*!
@@ -5581,6 +5585,9 @@ static void queue_stasis_data_destructor(void *obj)
ao2_cleanup(queue_data->member); ao2_cleanup(queue_data->member);
queue_unref(queue_data->queue); queue_unref(queue_data->queue);
ast_string_field_free_memory(queue_data); ast_string_field_free_memory(queue_data);
ao2_ref(queue_data->member_channel, -1);
ao2_ref(queue_data->caller_channel, -1);
} }
/*! /*!
@@ -5627,6 +5634,16 @@ static struct queue_stasis_data *queue_stasis_data_alloc(struct queue_ent *qe,
queue_data->caller_pos = qe->opos; queue_data->caller_pos = qe->opos;
ao2_ref(mem, +1); ao2_ref(mem, +1);
queue_data->member = mem; queue_data->member = mem;
/*
* During transfers it's possible for both the member and/or caller
* channel(s) to not be available. Adding a reference here ensures
* that the channels remain until app_queue is completely done with
* them.
*/
queue_data->member_channel = ao2_bump(peer);
queue_data->caller_channel = ao2_bump(qe->chan);
return queue_data; return queue_data;
} }