diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-31 22:03:55 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-31 22:03:55 +0000 |
commit | b30f07816bd23bbefea42bd32fa41ad4c4584fc7 (patch) | |
tree | 46aa59df564b5360dcd66957c19d16db7eec9580 /apps | |
parent | ca886930d90a8cbe208c52872fb8a04f5397c9d6 (diff) |
Merged revisions 185600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r185600 | mmichelson | 2009-03-31 17:02:48 -0500 (Tue, 31 Mar 2009) | 12 lines
Merged revisions 185599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r185599 | mmichelson | 2009-03-31 17:00:01 -0500 (Tue, 31 Mar 2009) | 6 lines
Fix crash that would occur if an empty member was specified in queues.conf.
(closes issue #14796)
Reported by: pida
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@185601 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_queue.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 85dc4fcd6..3dc8c943c 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -5489,6 +5489,11 @@ static int reload_queues(int reload) struct member tmpmem; membername = NULL; + if (ast_strlen_zero(var->value)) { + ast_log(LOG_WARNING, "Empty queue member definition at line %d. Moving on!\n", var->lineno); + continue; + } + /* Add a new member */ ast_copy_string(parse, var->value, sizeof(parse)); |