aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-16 20:24:56 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-16 20:24:56 +0000
commitf1b57c45cde90e61f4425e44c3c7a6bebb571f2d (patch)
tree36aa3d81a1a7014aa4742e9ad72b3dc692bcc7a7 /apps
parent84e634918bdab5d42205863cb839ba4e71d1d5b4 (diff)
Merged revisions 131375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r131375 | mmichelson | 2008-07-16 15:24:12 -0500 (Wed, 16 Jul 2008) | 22 lines Merged revisions 131369 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131369 | mmichelson | 2008-07-16 15:23:02 -0500 (Wed, 16 Jul 2008) | 14 lines Move the init_queue call back to where it used to be (changed Sept 12 last year). It was moved then to prevent a memory leak. Since then, the same memory leak recurred and was fixed in a better way. Now it has been found that the placement of this init_queue call can cause problems if a realtime queue has values changed to an empty string. The problem is that the default value for that queue parameter would not be set. (closes issue #13084) Reported by: elbriga ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131378 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index dcab13701..e8d805925 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1510,9 +1510,9 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
/* We traversed all variables and didn't find a strategy */
if (!tmpvar)
q->strategy = QUEUE_STRATEGY_RINGALL;
- init_queue(q); /* Ensure defaults for all parameters not set explicitly. */
ao2_link(queues, q);
}
+ init_queue(q); /* Ensure defaults for all parameters not set explicitly. */
memset(tmpbuf, 0, sizeof(tmpbuf));
for (v = queue_vars; v; v = v->next) {