kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 81158 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81158 | mmichelson | 2007-08-27 17:40:19 -0500 (Mon, 27 Aug 2007) | 5 lines

Resolve a potential deadlock. In this case, a single queue is locked, then the queue list. In changethread(), the queue list is
locked, and then each individual queue is locked. Under the right circumstances, this could deadlock. As such, I have unlocked
the individual queue before locking the queue list, and then locked the queue back after the queue list is unlocked.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-08-27 22:41:00 +00:00
parent 8b0c744786
commit 8176c0ee7c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_queue.c
View File

@@ -1198,7 +1198,9 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
} else {
q->members = next_m;
}
ast_mutex_unlock(&q->lock);
remove_from_interfaces(m->interface);
ast_mutex_lock(&q->lock);
q->membercount--;
ast_free(m);
} else {
@@ -1300,7 +1302,9 @@ static void update_realtime_members(struct call_queue *q)
} else {
q->members = next_m;
}
ast_mutex_unlock(&q->lock);
remove_from_interfaces(m->interface);
ast_mutex_lock(&q->lock);
q->membercount--;
free(m);
} else {