From: BJ Weschke <bweschke@btwtech.com>
Date: Thu, 28 Sep 2006 15:29:21 +0000 (+0000)
Subject: Merged revisions 43871 via svnmerge from
X-Git-Tag: 1.4.0-beta3~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=675749c7068364115eac9ca364c2b83f3f0115be;p=thirdparty%2Fasterisk.git

Merged revisions 43871 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43871 | bweschke | 2006-09-28 11:18:05 -0400 (Thu, 28 Sep 2006) | 3 lines

 Fix race condion crash with get_member_status (#7864 - tim_ringenbach reported and patched)


........


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 9741b8715e..87c04f7ee1 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -475,11 +475,12 @@ enum queue_member_status {
 	QUEUE_NORMAL
 };
 
-static enum queue_member_status get_member_status(const struct call_queue *q, int max_penalty)
+static enum queue_member_status get_member_status(struct call_queue *q, int max_penalty)
 {
 	struct member *member;
 	enum queue_member_status result = QUEUE_NO_MEMBERS;
 
+	ast_mutex_lock(&q->lock);
 	for (member = q->members; member; member = member->next) {
 		if (max_penalty && (member->penalty > max_penalty))
 			continue;
@@ -494,10 +495,12 @@ static enum queue_member_status get_member_status(const struct call_queue *q, in
 			result = QUEUE_NO_REACHABLE_MEMBERS;
 			break;
 		default:
+			ast_mutex_unlock(&q->lock);
 			return QUEUE_NORMAL;
 		}
 	}
 	
+	ast_mutex_unlock(&q->lock);
 	return result;
 }