From: David Vossel <dvossel@digium.com>
Date: Mon, 4 Jan 2010 16:51:19 +0000 (+0000)
Subject: Merged revisions 237327 via svnmerge from
X-Git-Tag: 1.6.1.13-rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28800a8ed13de332bbaa25bdc933fa5c2e0bf8d7;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@237329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 26bae613a3..b546845c19 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1375,6 +1375,11 @@ static void rt_handle_member_record(struct call_queue *q, char *interface, const
 	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);
 		if (penalty < 0)