[svn-commits] mmichelson: branch 1.6.0 r185601 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar 31 17:03:55 2009
New Revision: 185601

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=185601
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=185601&r1=185600&r2=185601
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Tue Mar 31 17:03:55 2009
@@ -5489,6 +5489,11 @@
 						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));