diff options
| author | Mark Spencer <markster@digium.com> | 2003-08-08 03:01:29 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2003-08-08 03:01:29 +0000 |
| commit | 29802d2ff5d55c15630823e906b1ed5c8d6e4723 (patch) | |
| tree | 778db8784daab048dcef321ca6c5f7fc1e721fed /channels/chan_local.c | |
| parent | 1d12de4da6b8c1f3b95b51c1715068b56ba6a49f (diff) | |
Properly defuse race in chan_local, fix extremely unlikely path for losing lock in chan_agent
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_local.c')
| -rwxr-xr-x | channels/chan_local.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 7567c81e4..7267a8d1f 100755 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -71,11 +71,14 @@ static struct local_pvt { static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_frame *f) { - struct ast_channel *other; - if (isoutbound) + struct ast_channel *other, *us; + if (isoutbound) { + us = p->chan; other = p->owner; - else + } else { + us = p->owner; other = p->chan; + } if (!other) return 0; p->glaredetect = 1; @@ -90,8 +93,11 @@ retrylock: if (pthread_mutex_trylock(&other->lock)) { /* Failed to lock. Release main lock and try again */ ast_pthread_mutex_unlock(&p->lock); + ast_pthread_mutex_unlock(&us->lock); /* Wait just a bit */ usleep(1); + /* Only we can destroy ourselves, so we can't disappear here */ + ast_pthread_mutex_lock(&us->lock); ast_pthread_mutex_lock(&p->lock); goto retrylock; } |