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
This commit is contained in:
BJ Weschke
2006-09-28 15:29:21 +00:00
parent 669bbb6784
commit 675749c706

View File

@@ -475,11 +475,12 @@ enum queue_member_status {
QUEUE_NORMAL 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; struct member *member;
enum queue_member_status result = QUEUE_NO_MEMBERS; enum queue_member_status result = QUEUE_NO_MEMBERS;
ast_mutex_lock(&q->lock);
for (member = q->members; member; member = member->next) { for (member = q->members; member; member = member->next) {
if (max_penalty && (member->penalty > max_penalty)) if (max_penalty && (member->penalty > max_penalty))
continue; continue;
@@ -494,10 +495,12 @@ static enum queue_member_status get_member_status(const struct call_queue *q, in
result = QUEUE_NO_REACHABLE_MEMBERS; result = QUEUE_NO_REACHABLE_MEMBERS;
break; break;
default: default:
ast_mutex_unlock(&q->lock);
return QUEUE_NORMAL; return QUEUE_NORMAL;
} }
} }
ast_mutex_unlock(&q->lock);
return result; return result;
} }