From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 31 Mar 2009 22:05:06 +0000 (+0000)
Subject: Merged revisions 185600 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec37bd0e63a3fd0c4f2e0bbee54ef4a33f0c08aa;p=thirdparty%2Fasterisk.git

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 c2650c499a..ac5db6ea75 100644
--- 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));