From ad6d049f732eb14801b74b9d2d8fd8ae33fec65d Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Thu, 19 Mar 2009 18:11:41 +0000 Subject: [PATCH] Merged revisions 183244 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r183244 | mmichelson | 2009-03-19 13:10:34 -0500 (Thu, 19 Mar 2009) | 16 lines Fix a memory leak associated with queues. For every attempt that app_queue made to place an outbound call to a queue member, we would allocate a queue_end_bridge structure. When the bridge for the call had completed, we would free the structure. Unfortunately not all call attempts actually end up bridged to a member, so we need to be more selective of when to allocate the structure. With this change, the allocation occurs in an area where we can guarantee that the call will be bridged. (closes issue #14680) Reported by: caspy Patches: 14680.patch uploaded by mmichelson (license 60) Tested by: caspy ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@183246 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index d29af2c600..0f2ab1f69b 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3404,19 +3404,6 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce } - if ((queue_end_bridge = ao2_alloc(sizeof(*queue_end_bridge), NULL))) { - queue_end_bridge->q = qe->parent; - queue_end_bridge->chan = qe->chan; - bridge_config.end_bridge_callback = end_bridge_callback; - bridge_config.end_bridge_callback_data = queue_end_bridge; - bridge_config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup; - /* Since queue_end_bridge can survive beyond the life of this call to Queue, we need - * to make sure to increase the refcount of this queue so it cannot be freed until we - * are done with it. We remove this reference in end_bridge_callback. - */ - queue_ref(qe->parent); - } - /* Hold the lock while we setup the outgoing calls */ if (use_weight) ao2_lock(queues); @@ -3961,6 +3948,20 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : ""); ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext)); ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten)); + + if ((queue_end_bridge = ao2_alloc(sizeof(*queue_end_bridge), NULL))) { + queue_end_bridge->q = qe->parent; + queue_end_bridge->chan = qe->chan; + bridge_config.end_bridge_callback = end_bridge_callback; + bridge_config.end_bridge_callback_data = queue_end_bridge; + bridge_config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup; + /* Since queue_end_bridge can survive beyond the life of this call to Queue, we need + * to make sure to increase the refcount of this queue so it cannot be freed until we + * are done with it. We remove this reference in end_bridge_callback. + */ + queue_ref(qe->parent); + } + time(&callstart); transfer_ds = setup_transfer_datastore(qe, member, callstart, callcompletedinsl); bridge = ast_bridge_call(qe->chan,peer, &bridge_config);