diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-23 19:18:49 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-23 19:18:49 +0000 |
| commit | 05eae987e29be8808b4e28d3582bfc44d73cdcdd (patch) | |
| tree | 205f6c19ba2f23dc97ec65e812dea1de8df20406 /channels/chan_local.c | |
| parent | acbcc31439f648e5d3215b15b49e13424cc01cc0 (diff) | |
Merged revisions 190287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r190287 | file | 2009-04-23 16:15:30 -0300 (Thu, 23 Apr 2009) | 13 lines
Merged revisions 190286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r190286 | file | 2009-04-23 16:13:18 -0300 (Thu, 23 Apr 2009) | 6 lines
Fix a bug in chan_local glare hangup detection.
If both sides of a Local channel were hung up at around the same time it was
possible for one thread to destroy the local private structure and have the other thread
immediately try to remove the already freed structure from the local channel list.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@190297 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index de161d6af..b87b35659 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -629,13 +629,10 @@ static int local_hangup(struct ast_channel *ast) let local_queue do it. */ if (glaredetect) ast_set_flag(p, LOCAL_CANCEL_QUEUE); - ast_mutex_unlock(&p->lock); /* Remove from list */ AST_LIST_LOCK(&locals); AST_LIST_REMOVE(&locals, p, list); AST_LIST_UNLOCK(&locals); - /* Grab / release lock just in case */ - ast_mutex_lock(&p->lock); ast_mutex_unlock(&p->lock); /* And destroy */ if (!glaredetect) { |