diff options
author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 15:29:21 +0000 |
---|---|---|
committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 15:29:21 +0000 |
commit | 8d91b416f6395b5d9f82186f542fc9536a9fd737 (patch) | |
tree | 4ba7fc79991b154b781f2c11af063a94cceacbfc | |
parent | f1d3a0f0d7ca5e83ecddab293932d8842b61fb32 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.4@43873 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_queue.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 9741b8715..87c04f7ee 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; } |