diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-01-24 22:38:17 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-01-24 22:38:17 +0000 |
commit | 49f69c3f941d21061011b8ab8b8e78f2d54c1957 (patch) | |
tree | 21eeffedcdfe1b08a8c1cb0c089322011a289852 /channel.c | |
parent | 1317b4bb6d06f57a77cedf835fc926feb5fe98f8 (diff) |
Merged revisions 8588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8588 | kpfleming | 2006-01-24 16:32:09 -0600 (Tue, 24 Jan 2006) | 2 lines
ensure that channel cannot become zombie after we check but before we try to start indications
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2050,10 +2050,12 @@ int ast_indicate(struct ast_channel *chan, int condition) { int res = -1; + ast_mutex_lock(&chan->lock); /* Stop if we're a zombie or need a soft hangup */ - if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) + if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { + ast_mutex_unlock(&chan->lock); return -1; - ast_mutex_lock(&chan->lock); + } if (chan->tech->indicate) res = chan->tech->indicate(chan, condition); ast_mutex_unlock(&chan->lock); |