[asterisk-commits] dvossel: branch 1.6.1 r237329 - in /branches/1.6.1: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Jan  4 10:51:19 2010
New Revision: 237329

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237329
Log:
Merged revisions 237327 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237327 | dvossel | 2010-01-04 10:39:11 -0600 (Mon, 04 Jan 2010) | 10 lines
  
  app_queue segfaults if realtime field uniqueid is NULL
  
  (closes issue #16385)
  Reported by: haakon
  Patches:
        app_queue.c.patch uploaded by haakon (license 880)
        app_queue.c.patch_v2 uploaded by dvossel (license 671)
  Tested by: haakon
........

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

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

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=237329&r1=237328&r2=237329
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Mon Jan  4 10:51:19 2010
@@ -1374,6 +1374,11 @@
 	int penalty = 0;
 	int paused  = 0;
 	int found = 0;
+
+	if (ast_strlen_zero(rt_uniqueid)) {
+		ast_log(LOG_WARNING, "Realtime field uniqueid is empty for memeber %s\n", S_OR(membername, "NULL"));
+		return;
+	}
 
 	if (penalty_str) {
 		penalty = atoi(penalty_str);