kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for the fact that the "other" channel can disappear while the local pvt

Browse Source 
is not locked.

(fixes a problem introduced in rev 100581)
(closes issue #12012)
Reported by: stevedavies
Patch by me


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@103821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-02-19 20:02:49 +00:00
parent 4671e11a5c
commit 8c9a6024d9
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/chan_local.c
View File

@@ -172,24 +172,22 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
return 0; return 0;
} }
ast_mutex_unlock(&p->lock);
/* Ensure that we have both channels locked */ /* Ensure that we have both channels locked */
if (us) { while (other && ast_channel_trylock(other)) {
while (ast_channel_trylock(other)) { ast_mutex_unlock(&p->lock);
if (us)
ast_channel_unlock(us); ast_channel_unlock(us);
usleep(1); usleep(1);
if (us)
ast_channel_lock(us); ast_channel_lock(us);
} ast_mutex_lock(&p->lock);
} else { other = isoutbound ? p->owner : p->chan;
ast_channel_lock(other);
} }
ast_queue_frame(other, f); if (other) {
ast_queue_frame(other, f);
ast_channel_unlock(other); ast_channel_unlock(other);
}
ast_mutex_lock(&p->lock);
ast_clear_flag(p, LOCAL_GLARE_DETECT); ast_clear_flag(p, LOCAL_GLARE_DETECT);