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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@185602 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index c2650c499aa5d885503541b96d2e28ec13363c7e..ac5db6ea75cc224ed5cd82f4e221447e08363e88 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -5558,6 +5558,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));